1 files changed, 5 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 41e6612ecbaf..d965da45160e 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -213,13 +213,12 @@ config MACH_OMAP3_PANDORA
         depends on ARCH_OMAP3
         default y
         select OMAP_PACKAGE_CBB
-        select REGULATOR_FIXED_VOLTAGE
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config MACH_OMAP3_TOUCHBOOK
         bool "OMAP3 Touch Book"
         depends on ARCH_OMAP3
         default y
-        select BACKLIGHT_CLASS_DEVICE
 
 config MACH_OMAP_3430SDP
         bool "OMAP 3430 SDP board"
@@ -265,7 +264,7 @@ config MACH_OMAP_ZOOM2
         select SERIAL_8250
         select SERIAL_CORE_CONSOLE
         select SERIAL_8250_CONSOLE
-        select REGULATOR_FIXED_VOLTAGE
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config MACH_OMAP_ZOOM3
         bool "OMAP3630 Zoom3 board"
@@ -275,7 +274,7 @@ config MACH_OMAP_ZOOM3
         select SERIAL_8250
         select SERIAL_CORE_CONSOLE
         select SERIAL_8250_CONSOLE
-        select REGULATOR_FIXED_VOLTAGE
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config MACH_CM_T35
         bool "CompuLab CM-T35/CM-T3730 modules"
@@ -334,7 +333,7 @@ config MACH_OMAP_4430SDP
         depends on ARCH_OMAP4
         select OMAP_PACKAGE_CBL
         select OMAP_PACKAGE_CBS
-        select REGULATOR_FIXED_VOLTAGE
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config MACH_OMAP4_PANDA
         bool "OMAP4 Panda Board"
@@ -342,7 +341,7 @@ config MACH_OMAP4_PANDA
         depends on ARCH_OMAP4
         select OMAP_PACKAGE_CBL
         select OMAP_PACKAGE_CBS
-        select REGULATOR_FIXED_VOLTAGE
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config OMAP3_EMU
         bool "OMAP3 debugging peripherals"