diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 06:00:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 06:00:16 -0400 |
| commit | 4c31791c3d9d38ac052dd5e2981df713d8f3dcc4 (patch) | |
| tree | b7f95922b2f1da5b36d95176e6d8f826151f3ee1 /arch/arm/common/Kconfig | |
| parent | 98797a241e28b787b84d308b867ec4c5fe7bbdf8 (diff) | |
| parent | 7517b3fbe40c231d79d36f31c1e9930cbb8c4be2 (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/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 | |||
| 35 | config SHARP_PARAM | 35 | config SHARP_PARAM |
| 36 | bool | 36 | bool |
| 37 | 37 | ||
| 38 | config SHARPSL_PM | ||
| 39 | bool | ||
| 40 | select APM_EMULATION | ||
| 41 | |||
| 42 | config SHARP_SCOOP | 38 | config SHARP_SCOOP |
| 43 | bool | 39 | bool |
| 44 | 40 | ||