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 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
board-sam9m10g45ek.c
diff --git
a/arch/arm/mach-at91/board-sam9m10g45ek.c
b/arch/arm/mach-at91/board-sam9m10g45ek.c
index
ee80059
..
7913984
100644
(file)
--- a/
arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/
arch/arm/mach-at91/board-sam9m10g45ek.c
@@
-135,7
+135,7
@@
static struct atmel_nand_data __initdata ek_nand_data = {
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
.partition_info = nand_partitions,
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
.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,
@@
-399,10
+399,8
@@
static void __init ek_board_init(void)
at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led));
}
at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led));
}
-MACHINE_START(AT91SAM9
G45EKES, "Atmel AT91SAM9G45-EKES
")
+MACHINE_START(AT91SAM9
M10G45EK, "Atmel AT91SAM9M10G45-EK
")
/* Maintainer: Atmel */
/* Maintainer: Atmel */
- .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 = ek_map_io,
.boot_params = AT91_SDRAM_BASE + 0x100,
.timer = &at91sam926x_timer,
.map_io = ek_map_io,