diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 15:07:03 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 15:07:03 (GMT) |
| commit | ced62c33fc434b9d44118c9f35803af8088cc3fe (patch) | |
| tree | 34d1145899e0e5853c4d5b45162f86bbe46941ea /arch/arm/mach-at91/board-rm9200ek.c | |
| parent | 3ff80abce7d0d3c1eacda53e73c94a57ade2e0a5 (diff) | |
| parent | 6838e601e6dc63440fd4315c1c2f3a2ef4ccdd6e (diff) | |
| download | linux-fsl-qoriq-ced62c33fc434b9d44118c9f35803af8088cc3fe.tar.xz | |
Merge tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/cleanup
From: Sascha Hauer <s.hauer@pengutronix.de>
ARM: i.MX cleanups for 3.5
* tag 'imx-cleanup' of git://git.pengutronix.de/git/imx/linux-2.6: (5 commits)
ARM: mx53: fix pad definitions for MX53_PAD_EIM_D28__I2C1_SDA and MX53_PAD_GPIO_8__CAN1_RXCAN
ARM: imx/eukrea_mbimx27-baseboard: fix typo in error message
ARM: i.MX51 iomux: add missed definitions for SION-bit and mode for some pads
arm: imx: add missing select IMX_HAVE_PLATFORM for MACH_MX35_3DS in Kconfig
arm: imx: make various struct sys_timer static
Includes an update to 3.4-rc4
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/board-rm9200ek.c')
| -rw-r--r-- | arch/arm/mach-at91/board-rm9200ek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c index 78ffc83..2b15b8a 100644 --- a/arch/arm/mach-at91/board-rm9200ek.c +++ b/arch/arm/mach-at91/board-rm9200ek.c @@ -103,7 +103,7 @@ static struct i2c_board_info __initdata ek_i2c_devices[] = { }; #define EK_FLASH_BASE AT91_CHIPSELECT_0 -#define EK_FLASH_SIZE SZ_2M +#define EK_FLASH_SIZE SZ_8M static struct physmap_flash_data ek_flash_data = { .width = 2, |