diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /arch/arm/common/Kconfig | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'arch/arm/common/Kconfig')
| -rw-r--r-- | arch/arm/common/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 5e34ca6d38b6..3e073467caca 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig | |||
| @@ -28,6 +28,7 @@ config SHARP_PARAM | |||
| 28 | 28 | ||
| 29 | config SHARPSL_PM | 29 | config SHARPSL_PM |
| 30 | bool | 30 | bool |
| 31 | select APM_EMULATION | ||
| 31 | 32 | ||
| 32 | config SHARP_SCOOP | 33 | config SHARP_SCOOP |
| 33 | bool | 34 | bool |