diff options
| author | Russell King | 2009-06-14 12:00:16 +0200 |
|---|---|---|
| committer | Russell King | 2009-06-14 12:00:16 +0200 |
| commit | 4c31791c3d9d38ac052dd5e2981df713d8f3dcc4 (patch) | |
| tree | b7f95922b2f1da5b36d95176e6d8f826151f3ee1 /arch/arm/common/Kconfig | |
| parent | Merge branch 'copy_user' of git://git.marvell.com/orion into devel (diff) | |
| parent | MAINTAINERS: update Eric Miao's email address and status (diff) | |
| download | kernel-qcow2-linux-4c31791c3d9d38ac052dd5e2981df713d8f3dcc4.tar.gz kernel-qcow2-linux-4c31791c3d9d38ac052dd5e2981df713d8f3dcc4.tar.xz kernel-qcow2-linux-4c31791c3d9d38ac052dd5e2981df713d8f3dcc4.zip | |
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/common/Kconfig')
| -rw-r--r-- | arch/arm/common/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 08f27862d09d..4efbb9df0444 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig @@ -35,10 +35,6 @@ config SHARP_LOCOMO config SHARP_PARAM bool -config SHARPSL_PM - bool - select APM_EMULATION - config SHARP_SCOOP bool |