Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap-for-linus

1 files changed, 10 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 36885152262..fc3a181aac8 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -85,6 +85,12 @@ config OMAP_PACKAGE_CUS
 config OMAP_PACKAGE_CBP
        bool
 
+config OMAP_PACKAGE_CBL
+       bool
+
+config OMAP_PACKAGE_CBS
+       bool
+
 comment "OMAP Board Type"
         depends on ARCH_OMAP2PLUS
 
@@ -282,11 +288,15 @@ config MACH_OMAP_4430SDP
         bool "OMAP 4430 SDP board"
         default y
         depends on ARCH_OMAP4
+        select OMAP_PACKAGE_CBL
+        select OMAP_PACKAGE_CBS
 
 config MACH_OMAP4_PANDA
         bool "OMAP4 Panda Board"
         default y
         depends on ARCH_OMAP4
+        select OMAP_PACKAGE_CBL
+        select OMAP_PACKAGE_CBS
 
 config OMAP3_EMU
         bool "OMAP3 debugging peripherals"