diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 19:13:58 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 19:13:58 (GMT) |
commit | f56b71f5d5a3944acdcb0e5e1739574d95ddf61a (patch) | |
tree | 2cdfad1895d7638489a74af22bd6cb760f95c848 /arch/arm/mach-ux500/Kconfig | |
parent | c0206e228e34d8b414fcc63db45b831843adea06 (diff) | |
parent | 3510ec672319e09fe43bd623b19fcf539c0bd1fa (diff) | |
download | linux-fsl-qoriq-f56b71f5d5a3944acdcb0e5e1739574d95ddf61a.tar.xz |
Merge branch 'ux500/soc' into ux500/dt
Diffstat (limited to 'arch/arm/mach-ux500/Kconfig')
-rw-r--r-- | arch/arm/mach-ux500/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 52af004..5cfa539 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -28,6 +28,7 @@ config MACH_U8500 bool "U8500 Development platform" depends on UX500_SOC_DB8500 select TPS6105X + select SOC_BUS help Include support for the mop500 development platform. |