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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
blackfin
/
include
/
asm
/
bfin5xx_spi.h
diff --git
a/arch/blackfin/include/asm/bfin5xx_spi.h
b/arch/blackfin/include/asm/bfin5xx_spi.h
index
1306e6b
..
0292d58
100644
(file)
--- a/
arch/blackfin/include/asm/bfin5xx_spi.h
+++ b/
arch/blackfin/include/asm/bfin5xx_spi.h
@@
-110,7
+110,7
@@
struct bfin5xx_spi_master {
u16 num_chipselect;
u8 enable_dma;
- u16 pin_req[
4
];
+ u16 pin_req[
7
];
};
/* spi_board_info.controller_data for SPI slave devices,