diff --git a/[refs] b/[refs] index 347ff04d1ea9..896cc2b76906 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c43ee4481689586be3430684f543f53ab3dfe35 +refs/heads/master: 382bd12528777be5236acf0a19e016aebfc9a34a diff --git a/trunk/arch/arm/mach-ux500/Kconfig b/trunk/arch/arm/mach-ux500/Kconfig index 94d80a4e4370..d00881297202 100644 --- a/trunk/arch/arm/mach-ux500/Kconfig +++ b/trunk/arch/arm/mach-ux500/Kconfig @@ -25,7 +25,6 @@ menu "Ux500 target platform (boards)" config MACH_U8500 bool "U8500 Development platform" select UX500_SOC_DB8500 - select TPS6105X help Include support for the mop500 development platform.