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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[pandora-kernel.git]
/
arch
/
blackfin
/
mach-bf518
/
boards
/
tcm-bf518.c
diff --git
a/arch/blackfin/mach-bf518/boards/tcm-bf518.c
b/arch/blackfin/mach-bf518/boards/tcm-bf518.c
index
9b72e5c
..
bead810
100644
(file)
--- a/
arch/blackfin/mach-bf518/boards/tcm-bf518.c
+++ b/
arch/blackfin/mach-bf518/boards/tcm-bf518.c
@@
-291,7
+291,7
@@
static struct platform_device bfin_spi0_device = {
/* SPI (1) */
static struct bfin5xx_spi_master bfin_spi1_info = {
- .num_chipselect =
5
,
+ .num_chipselect =
6
,
.enable_dma = 1, /* master has the ability to do dma transfer */
.pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},
};