diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:14:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:14:25 -0400 |
| commit | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (patch) | |
| tree | a5dd723679582505ef3905c90f0c2c032d191b94 /arch/arm/mach-mx5/board-mx53_loco.c | |
| parent | 526b264163068f77c5f2409031f5e25caf3900a9 (diff) | |
| parent | c5d7a9230e5e277f262b6806b7f4d6b35de5a3fb (diff) | |
Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
Diffstat (limited to 'arch/arm/mach-mx5/board-mx53_loco.c')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx53_loco.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-mx5/board-mx53_loco.c index 7149416d1519..0af2766f8610 100644 --- a/arch/arm/mach-mx5/board-mx53_loco.c +++ b/arch/arm/mach-mx5/board-mx53_loco.c | |||
| @@ -293,6 +293,7 @@ static void __init mx53_loco_board_init(void) | |||
| 293 | imx53_add_sdhci_esdhc_imx(2, &mx53_loco_sd3_data); | 293 | imx53_add_sdhci_esdhc_imx(2, &mx53_loco_sd3_data); |
| 294 | imx_add_gpio_keys(&loco_button_data); | 294 | imx_add_gpio_keys(&loco_button_data); |
| 295 | gpio_led_register_device(-1, &mx53loco_leds_data); | 295 | gpio_led_register_device(-1, &mx53loco_leds_data); |
| 296 | imx53_add_ahci_imx(); | ||
| 296 | } | 297 | } |
| 297 | 298 | ||
| 298 | static void __init mx53_loco_timer_init(void) | 299 | static void __init mx53_loco_timer_init(void) |