diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:33:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:33:50 -0400 |
| commit | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (patch) | |
| tree | bade11b3088e3768612ecb2cd6e285ab67a23286 /arch/arm/mach-pxa/Kconfig | |
| parent | f6335c43f3d7816ba2e69abce4f29c41f65bb27e (diff) | |
| parent | 175854be81dc42b70591760c193113e4898b3e6f (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index f781873431f3..a062235e83a8 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig | |||
| @@ -71,6 +71,14 @@ config PXA_SHARPSL | |||
| 71 | SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) | 71 | SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) |
| 72 | handheld computer. | 72 | handheld computer. |
| 73 | 73 | ||
| 74 | config CORGI_SSP_DEPRECATED | ||
| 75 | bool | ||
| 76 | select PXA_SSP | ||
| 77 | help | ||
| 78 | This option will include corgi_ssp.c and corgi_lcd.c | ||
| 79 | that corgi_ts.c and other legacy drivers (corgi_bl.c | ||
| 80 | and sharpsl_pm.c) may depend on. | ||
| 81 | |||
| 74 | config MACH_POODLE | 82 | config MACH_POODLE |
| 75 | bool "Enable Sharp SL-5600 (Poodle) Support" | 83 | bool "Enable Sharp SL-5600 (Poodle) Support" |
| 76 | depends on PXA_SHARPSL | 84 | depends on PXA_SHARPSL |