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 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-at572d940hf_ek.c
diff --git
a/arch/arm/mach-at91/board-at572d940hf_ek.c
b/arch/arm/mach-at91/board-at572d940hf_ek.c
index
5daff27
..
3929f1c
100644
(file)
--- a/
arch/arm/mach-at91/board-at572d940hf_ek.c
+++ b/
arch/arm/mach-at91/board-at572d940hf_ek.c
@@
-216,7
+216,7
@@
static struct atmel_nand_data __initdata eb_nand_data = {
/* .rdy_pin = AT91_PIN_PC16, */
.enable_pin = AT91_PIN_PA15,
.partition_info = nand_partitions,
/* .rdy_pin = AT91_PIN_PC16, */
.enable_pin = AT91_PIN_PA15,
.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,
.bus_width_16 = 1,
#else
.bus_width_16 = 0,
@@
-318,8
+318,6
@@
static void __init eb_board_init(void)
MACHINE_START(AT572D940HFEB, "Atmel AT91D940HF-EB")
/* Maintainer: Atmel <costa.antonior@gmail.com> */
MACHINE_START(AT572D940HFEB, "Atmel AT91D940HF-EB")
/* Maintainer: Atmel <costa.antonior@gmail.com> */
- .phys_io = AT91_BASE_SYS,
- .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
.boot_params = AT91_SDRAM_BASE + 0x100,
.timer = &at91sam926x_timer,
.map_io = eb_map_io,
.boot_params = AT91_SDRAM_BASE + 0x100,
.timer = &at91sam926x_timer,
.map_io = eb_map_io,