diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /arch/arm/mach-at91/board-usb-a9260.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'arch/arm/mach-at91/board-usb-a9260.c')
| -rw-r--r-- | arch/arm/mach-at91/board-usb-a9260.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-usb-a9260.c b/arch/arm/mach-at91/board-usb-a9260.c index aed31f863600..4048e47c5190 100644 --- a/arch/arm/mach-at91/board-usb-a9260.c +++ b/arch/arm/mach-at91/board-usb-a9260.c | |||
| @@ -121,7 +121,7 @@ static struct atmel_nand_data __initdata ek_nand_data = { | |||
| 121 | .rdy_pin = AT91_PIN_PC13, | 121 | .rdy_pin = AT91_PIN_PC13, |
| 122 | .enable_pin = AT91_PIN_PC14, | 122 | .enable_pin = AT91_PIN_PC14, |
| 123 | .partition_info = nand_partitions, | 123 | .partition_info = nand_partitions, |
| 124 | #if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16) | 124 | #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) |
| 125 | .bus_width_16 = 1, | 125 | .bus_width_16 = 1, |
| 126 | #else | 126 | #else |
| 127 | .bus_width_16 = 0, | 127 | .bus_width_16 = 0, |