diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 04:50:33 -0500 |
| commit | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (patch) | |
| tree | 517290fd884d286fe2971137ac89f89e3567785a /arch/arm/mach-omap2/Kconfig | |
| parent | 160bbab3000dafccbe43688e48208cecf4deb879 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/mach-omap2/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 4832fcc7d04a..3754b79092ab 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -55,3 +55,7 @@ config MACH_OMAP_LDP | |||
| 55 | config MACH_OVERO | 55 | config MACH_OVERO |
| 56 | bool "Gumstix Overo board" | 56 | bool "Gumstix Overo board" |
| 57 | depends on ARCH_OMAP3 && ARCH_OMAP34XX | 57 | depends on ARCH_OMAP3 && ARCH_OMAP34XX |
| 58 | |||
| 59 | config MACH_OMAP3_PANDORA | ||
| 60 | bool "OMAP3 Pandora" | ||
| 61 | depends on ARCH_OMAP3 && ARCH_OMAP34XX \ No newline at end of file | ||