diff options
| author | Dave Jones <davej@redhat.com> | 2006-01-08 04:05:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:14:08 -0500 |
| commit | 987d4613e52e4f655278265aabbcc69237018b1d (patch) | |
| tree | 4190d1488573764e871c3299bac0624858ec3a19 /arch/i386/Kconfig | |
| parent | 9fe656e91fd95d0893cc4831b032e0be60791bd7 (diff) | |
[PATCH] Make apm buildable without legacy pm
APM doesn't _need_ the PM_LEGACY junk, so remove it's dependancy from
Kconfig, and ifdef the junk in the code. Whilst the ifdefs are ugly, when
the legacy stuff gets ripped out so will the ifdefs.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/Kconfig')
| -rw-r--r-- | arch/i386/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index 486449e9e710..810ba8c37a5f 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
| @@ -699,7 +699,7 @@ depends on PM && !X86_VISWS | |||
| 699 | 699 | ||
| 700 | config APM | 700 | config APM |
| 701 | tristate "APM (Advanced Power Management) BIOS support" | 701 | tristate "APM (Advanced Power Management) BIOS support" |
| 702 | depends on PM && PM_LEGACY | 702 | depends on PM |
| 703 | ---help--- | 703 | ---help--- |
| 704 | APM is a BIOS specification for saving power using several different | 704 | APM is a BIOS specification for saving power using several different |
| 705 | techniques. This is mostly useful for battery powered laptops with | 705 | techniques. This is mostly useful for battery powered laptops with |