diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 17:27:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 17:27:29 -0700 |
| commit | ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548 (patch) | |
| tree | ed80eaf6245d8d1509662dc42e7184391b91e7d1 /drivers | |
| parent | bcefc8d0d3a0cba9078f519d69f138b93ad30e39 (diff) | |
| parent | 77154a2026ee5cb2ce05a7d370c16e4c123028e5 (diff) | |
| download | linux-3.10-ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548.tar.gz linux-3.10-ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548.tar.bz2 linux-3.10-ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/fsl-booke: Fix address issue when using relocatable kernels
powerpc/cpm1: Mark micropatch code/data static and __init
powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations
powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)
Diffstat (limited to 'drivers')
| -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 ffa111a7e9d..97ab0a81338 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) |