diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-29 15:03:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 15:03:43 -0400 |
| commit | 949abd84cd54ff864efca9df822d1e02a56694ec (patch) | |
| tree | 0c0e7696a51e2989f11a37478ff26368cab0e227 /arch/arm/mach-omap1/Kconfig | |
| parent | b0958aed1ea39825439a7848544bfb2e267273b4 (diff) | |
| parent | cd07ecc828486e5887113c7dc4d9f9022145811b (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-omap1/Kconfig')
| -rw-r--r-- | arch/arm/mach-omap1/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index cd8de89c5fad..55ecc01ea206 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig | |||
| @@ -46,7 +46,6 @@ config MACH_OMAP_H2 | |||
| 46 | config MACH_OMAP_H3 | 46 | config MACH_OMAP_H3 |
| 47 | bool "TI H3 Support" | 47 | bool "TI H3 Support" |
| 48 | depends on ARCH_OMAP1 && ARCH_OMAP16XX | 48 | depends on ARCH_OMAP1 && ARCH_OMAP16XX |
| 49 | # select GPIOEXPANDER_OMAP | ||
| 50 | help | 49 | help |
| 51 | TI OMAP 1710 H3 board support. Say Y here if you have such | 50 | TI OMAP 1710 H3 board support. Say Y here if you have such |
| 52 | a board. | 51 | a board. |