diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/arm/mach-w90x900/dev.c | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'arch/arm/mach-w90x900/dev.c')
| -rw-r--r-- | arch/arm/mach-w90x900/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c index 51f17b753348..ec711f4b4019 100644 --- a/arch/arm/mach-w90x900/dev.c +++ b/arch/arm/mach-w90x900/dev.c | |||
| @@ -197,7 +197,7 @@ static struct platform_device nuc900_device_emc = { | |||
| 197 | 197 | ||
| 198 | /* SPI device */ | 198 | /* SPI device */ |
| 199 | 199 | ||
| 200 | static struct w90p910_spi_info nuc900_spiflash_data = { | 200 | static struct nuc900_spi_info nuc900_spiflash_data = { |
| 201 | .num_cs = 1, | 201 | .num_cs = 1, |
| 202 | .lsb = 0, | 202 | .lsb = 0, |
| 203 | .txneg = 1, | 203 | .txneg = 1, |