summaryrefslogtreecommitdiff
path: root/drivers/soc/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-14 16:23:19 +0300
committerArnd Bergmann <arnd@arndb.de>2016-07-14 16:23:19 +0300
commitf1844aca29025bb436bfc4f872456b832632df56 (patch)
treea9df7248ed8595db2f3313ea2e016cf19757eca4 /drivers/soc/Kconfig
parentcf1d9dd447935bd90d42ee349c1da2498cff8775 (diff)
parenta16729ea822806a6f87415bcb523eaeb7f4b4ebd (diff)
downloadlinux-f1844aca29025bb436bfc4f872456b832632df56.tar.xz
Merge tag 'ux500-cleanup-bundle' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers
Merge "Ux500 cleanups from Arnd" from Linus Walleij: This is a set of cleanups for the Ux500 that reduce the number of machine-local files and boardfile-type data for regulators and ASoC. * tag 'ux500-cleanup-bundle' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: ARM: ux500: consolidate base platform files ARM: ux500: move soc_id driver to drivers/soc ARM: ux500: call ux500_setup_id later ARM: ux500: consolidate soc_device code in id.c ARM: ux500: remove cpu_is_u* helpers ARM: ux500: use CLK_OF_DECLARE() ARM: ux500: move l2x0 init to .init_irq mfd: db8500 stop passing around platform data ASoC: ab8500-codec: remove platform data based probe ARM: ux500: move ab8500_regulator_plat_data into driver ARM: ux500: remove unused regulator data
Diffstat (limited to 'drivers/soc/Kconfig')
-rw-r--r--drivers/soc/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig
index 91d5c05d395f..fe42a2fdf351 100644
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@ -9,6 +9,7 @@ source "drivers/soc/samsung/Kconfig"
source "drivers/soc/sunxi/Kconfig"
source "drivers/soc/tegra/Kconfig"
source "drivers/soc/ti/Kconfig"
+source "drivers/soc/ux500/Kconfig"
source "drivers/soc/versatile/Kconfig"
endmenu