Re: Make apm buildable without legacy pm.

[Kurt Wall]

On Tue, Jan 03, 2006 at 09:33:52AM -0500, Dave Jones took 0 lines to write:
> 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@xxxxxxxxxx>
> 
> --- linux-2.6.14/arch/i386/Kconfig~	2005-12-22 22:06:10.000000000 -0500
> +++ linux-2.6.14/arch/i386/Kconfig	2005-12-22 22:06:16.000000000 -0500
> @@ -710,7 +710,7 @@ depends on PM && !X86_VISWS
>  
>  config APM
>  	tristate "APM (Advanced Power Management) BIOS support"
> -	depends on PM && PM_LEGACY
> +	depends on PM
>  	---help---
>  	  APM is a BIOS specification for saving power using several different
>  	  techniques. This is mostly useful for battery powered laptops with

Here's this hunk re-diffed against 2.6.15 (which applies without
needing patch to apply an offset of -11 lines):

--- linux-2.6.15/arch/i386/Kconfig.orig	2006-01-04 20:33:43.000000000 -0500
+++ linux-2.6.15/arch/i386/Kconfig	2006-01-04 20:35:34.000000000 -0500
@@ -699,7 +699,7 @@
 
 config APM
 	tristate "APM (Advanced Power Management) BIOS support"
-	depends on PM && PM_LEGACY
+	depends on PM
 	---help---
 	  APM is a BIOS specification for saving power using several different
 	  techniques. This is mostly useful for battery powered laptops with

Kurt
-- 
If I traveled to the end of the rainbow
As Dame Fortune did intend,
Murphy would be there to tell me
The pot's at the other end.
		-- Bert Whitney
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/