git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
arch
/
blackfin
/
mach-bf537
/
boards
/
dnp5370.c
diff --git
a/arch/blackfin/mach-bf537/boards/dnp5370.c
b/arch/blackfin/mach-bf537/boards/dnp5370.c
index
6b4ff46
..
8bc951d
100644
(file)
--- a/
arch/blackfin/mach-bf537/boards/dnp5370.c
+++ b/
arch/blackfin/mach-bf537/boards/dnp5370.c
@@
-130,7
+130,6
@@
static struct platform_device asmb_flash_device = {
static struct bfin5xx_spi_chip mmc_spi_chip_info = {
.enable_dma = 0, /* use no dma transfer with this chip*/
static struct bfin5xx_spi_chip mmc_spi_chip_info = {
.enable_dma = 0, /* use no dma transfer with this chip*/
- .bits_per_word = 8,
};
#endif
};
#endif
@@
-161,7
+160,6
@@
static struct flash_platform_data bfin_spi_dataflash_data = {
static struct bfin5xx_spi_chip spi_dataflash_chip_info = {
.enable_dma = 0, /* use no dma transfer with this chip*/
static struct bfin5xx_spi_chip spi_dataflash_chip_info = {
.enable_dma = 0, /* use no dma transfer with this chip*/
- .bits_per_word = 8,
};
#endif
};
#endif