summaryrefslogtreecommitdiff
path: root/arch/arm/common/Kconfig
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2009-03-28 18:18:51 +0300
committerEric Miao <eric.y.miao@gmail.com>2009-06-11 22:20:22 +0800
commit78731d33c1868f4ba43bafcca8dcaf938872c1f2 (patch)
treea5d9f2ba40173182de56cae3628a5cb3eccfb6fa /arch/arm/common/Kconfig
parent391c5111c9ce346edc3c3d8f907eb178a6decd16 (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/common/Kconfig')
-rw-r--r--arch/arm/common/Kconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index a2cd9beaf37d..dea7ce337f89 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -27,10 +27,6 @@ config SHARP_LOCOMO
config SHARP_PARAM
bool
-config SHARPSL_PM
- bool
- select APM_EMULATION
-
config SHARP_SCOOP
bool