diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 04:16:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 04:16:43 +0100 |
| commit | 25498e5b3df931a3d52a6e0642ae242e4ee19488 (patch) | |
| tree | 5a627d71015fde644d8c61a04f7718c2f0a748db /arch/arm/mach-mx5/Kconfig | |
| parent | Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc (diff) | |
| parent | Merge branch 'at91/trng' into next/driver (diff) | |
| download | linux-25498e5b3df931a3d52a6e0642ae242e4ee19488.tar.xz linux-25498e5b3df931a3d52a6e0642ae242e4ee19488.zip | |
Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc
* 'next/driver' of git://git.linaro.org/people/arnd/arm-soc:
hw_random: add driver for atmel true hardware random number generator
ARM: at91: at91sam9g45: add trng clock and platform device
MX53 Enable the AHCI SATA on MX53 SMD board
MX53 Enable the AHCI SATA on MX53 LOCO board
MX53 Enable the AHCI SATA on MX53 ARD board
AHCI Add the AHCI SATA feature on the MX53 platforms
Fix pata imx resource
ARM: imx: Define functions for registering PATA
ARM: imx: Add PATA clock support
ARM: imx: Add PATA resources for other i.MX processors
imx: efika: Enable pata.
imx51: add pata clock
imx51: add pata device
Fix up trivial conflict (new selects next to each other from separate
branches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig
Diffstat (limited to 'arch/arm/mach-mx5/Kconfig')
| -rw-r--r-- | arch/arm/mach-mx5/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index b4f5ab669e48..5e42c73881a5 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig @@ -153,6 +153,7 @@ config MX51_EFIKA_COMMON select SOC_IMX51 select IMX_HAVE_PLATFORM_IMX_UART select IMX_HAVE_PLATFORM_MXC_EHCI + select IMX_HAVE_PLATFORM_PATA_IMX select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX select IMX_HAVE_PLATFORM_SPI_IMX select MXC_ULPI if USB_ULPI |