git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-stream...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-w90x900
/
dev.c
diff --git
a/arch/arm/mach-w90x900/dev.c
b/arch/arm/mach-w90x900/dev.c
index 51f17b753348bd3e5f3ca508a061bdb7150e9f2e..ec711f4b40191affdef9fb1e021780e4b900747e 100644
(file)
--- 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 = {
/* SPI device */
-static struct
w90p91
0_spi_info nuc900_spiflash_data = {
+static struct
nuc90
0_spi_info nuc900_spiflash_data = {
.num_cs = 1,
.lsb = 0,
.txneg = 1,