diff options
author | Tony Lindgren <tony@atomide.com> | 2010-11-30 14:46:36 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-11-30 14:46:36 -0800 |
commit | 52aa8c539dad56728527de664f368915ff44badf (patch) | |
tree | 4aa8615023e0bc49153e1dc160fd727f09eb4f71 /arch/arm/mach-omap2/Kconfig | |
parent | 55a4e78952286d498d89a399d845e7cfaa8ddd56 (diff) | |
parent | 032a6424aeea7333a8dafc8cc05dd10b09c62680 (diff) | |
download | op-kernel-dev-52aa8c539dad56728527de664f368915ff44badf.zip op-kernel-dev-52aa8c539dad56728527de664f368915ff44badf.tar.gz |
Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 3688515..fc3a181 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" |