diff options
| author | Dmitry Eremin-Solenikov | 2009-03-28 18:18:51 +0300 |
|---|---|---|
| committer | Eric Miao | 2009-06-11 22:20:22 +0800 |
| commit | 78731d33c1868f4ba43bafcca8dcaf938872c1f2 (patch) | |
| tree | a5d9f2ba40173182de56cae3628a5cb3eccfb6fa /arch/arm/mach-pxa/Kconfig | |
| parent | 391c5111c9ce346edc3c3d8f907eb178a6decd16 (diff) | |
[ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
collie_pm was the only non-PXA user of sharpsl_pm. Now as it's gone we
can merge code into one single file to allow further cleanup.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/Kconfig')
| -rw-r--r-- | arch/arm/mach-pxa/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index 2e45630ebdee..f4533f8ff4e8 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -94,6 +94,10 @@ config PXA_SHARPSL SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa) handheld computer. +config SHARPSL_PM + bool + select APM_EMULATION + config CORGI_SSP_DEPRECATED bool select PXA_SSP |