diff options
| author | Arnd Bergmann | 2011-10-20 15:14:25 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2011-10-20 15:14:25 +0200 |
| commit | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (patch) | |
| tree | a5dd723679582505ef3905c90f0c2c032d191b94 /arch/arm/mach-mx5/board-mx53_loco.c | |
| parent | Merge branch 'imx/cleanup' into imx/devel (diff) | |
| parent | Merge branch 'features/denx-mx28' into for-arnd-features (diff) | |
| download | kernel-qcow2-linux-b4cbb8a4e602ea77b0525d06eff89c6a6070dab3.tar.gz kernel-qcow2-linux-b4cbb8a4e602ea77b0525d06eff89c6a6070dab3.tar.xz kernel-qcow2-linux-b4cbb8a4e602ea77b0525d06eff89c6a6070dab3.zip | |
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) imx53_add_sdhci_esdhc_imx(2, &mx53_loco_sd3_data); imx_add_gpio_keys(&loco_button_data); gpio_led_register_device(-1, &mx53loco_leds_data); + imx53_add_ahci_imx(); } static void __init mx53_loco_timer_init(void) |