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/sam/kbuild-fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-sam9263ek.c
diff --git
a/arch/arm/mach-at91/board-sam9263ek.c
b/arch/arm/mach-at91/board-sam9263ek.c
index
cc925ec
..
334b159
100644
(file)
--- a/
arch/arm/mach-at91/board-sam9263ek.c
+++ b/
arch/arm/mach-at91/board-sam9263ek.c
@@
-194,7
+194,7
@@
static struct atmel_nand_data __initdata ek_nand_data = {
.rdy_pin = AT91_PIN_PA22,
.enable_pin = AT91_PIN_PD15,
.partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT
91
_BUSWIDTH_16)
+#if defined(CONFIG_MTD_NAND_AT
MEL
_BUSWIDTH_16)
.bus_width_16 = 1,
#else
.bus_width_16 = 0,