diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 09:44:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 09:44:28 -0800 |
| commit | 2fd592e45b9c89d69e126f172d0f991e2af955e5 (patch) | |
| tree | bacc34dbffb5da09b40840f409f7fad462e0acac /arch/sh/Kconfig | |
| parent | 2affc857efdf7dacace234b63d289d67260c95a6 (diff) | |
| parent | 0a9b0db19262dbb09f3a34195e68cafd5dc3fa10 (diff) | |
| download | linux-2fd592e45b9c89d69e126f172d0f991e2af955e5.tar.bz2 | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm:
[APM] SH: Convert to use shared APM emulation.
[APM] MIPS: Convert to use shared APM emulation.
[APM] ARM: Convert to use shared APM emulation.
[APM] Add shared version of APM emulation
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 3aa3b885ab36..4f3891215b87 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -48,6 +48,9 @@ config GENERIC_IOMAP config GENERIC_TIME def_bool n +config SYS_SUPPORTS_APM_EMULATION + bool + config ARCH_MAY_HAVE_PC_FDC bool @@ -126,6 +129,7 @@ config SH_7751_SYSTEMH config SH_HP6XX bool "HP6XX" + select SYS_SUPPORTS_APM_EMULATION help Select HP6XX if configuring for a HP jornada HP6xx. More information (hardware only) at @@ -694,9 +698,6 @@ depends on EXPERIMENTAL source kernel/power/Kconfig -config APM - bool "Advanced Power Management Emulation" - depends on PM endmenu source "net/Kconfig" |