diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-25 17:52:21 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-25 17:52:21 -0600 |
| commit | 5ffdcd94ea0171cf9a3ca63051c2246426103b5b (patch) | |
| tree | dfa1522796d5af649caf64ac6e2f1e69119e85d0 /drivers/spi | |
| parent | cf40f082f8d3a98e28af02af20d00d2500eb6a65 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
| download | linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.tar.gz linux-5ffdcd94ea0171cf9a3ca63051c2246426103b5b.tar.xz | |
Merge commit 'v2.6.35-rc6' into spi/test
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi_mpc8xxx.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c index ffa111a7e9d4..97ab0a81338a 100644 --- a/drivers/spi/spi_mpc8xxx.c +++ b/drivers/spi/spi_mpc8xxx.c @@ -66,28 +66,6 @@ struct mpc8xxx_spi_reg { __be32 receive; }; -/* SPI Parameter RAM */ -struct spi_pram { - __be16 rbase; /* Rx Buffer descriptor base address */ - __be16 tbase; /* Tx Buffer descriptor base address */ - u8 rfcr; /* Rx function code */ - u8 tfcr; /* Tx function code */ - __be16 mrblr; /* Max receive buffer length */ - __be32 rstate; /* Internal */ - __be32 rdp; /* Internal */ - __be16 rbptr; /* Internal */ - __be16 rbc; /* Internal */ - __be32 rxtmp; /* Internal */ - __be32 tstate; /* Internal */ - __be32 tdp; /* Internal */ - __be16 tbptr; /* Internal */ - __be16 tbc; /* Internal */ - __be32 txtmp; /* Internal */ - __be32 res; /* Tx temp. */ - __be16 rpbase; /* Relocation pointer (CPM1 only) */ - __be16 res1; /* Reserved */ -}; - /* SPI Controller mode register definitions */ #define SPMODE_LOOP (1 << 30) #define SPMODE_CI_INACTIVEHIGH (1 << 29) |