X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmacintosh%2FKconfig;h=12ad462737ba59ba55f3b76a6f2e04167524df1b;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=d5d649f5ccdb3a05f14309fd1e11af83c7486a9f;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index d5d649f5c..12ad46273 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -78,27 +78,6 @@ config ADB_PMU
 	  this device; you should do so if your machine is one of those
 	  mentioned above.
 
-config ADB_PMU_LED
-	bool "Support for the Power/iBook front LED"
-	depends on ADB_PMU
-	select NEW_LEDS
-	select LEDS_CLASS
-	help
-	  Support the front LED on Power/iBooks as a generic LED that can
-	  be triggered by any of the supported triggers. To get the
-	  behaviour of the old CONFIG_BLK_DEV_IDE_PMAC_BLINK, select this
-	  and the ide-disk LED trigger and configure appropriately through
-	  sysfs.
-
-config ADB_PMU_LED_IDE
-	bool "Use front LED as IDE LED by default"
-	depends on ADB_PMU_LED
-	select LEDS_TRIGGERS
-	select LEDS_TRIGGER_IDE_DISK
-	help
-	  This option makes the front LED default to the IDE trigger
-	  so that it blinks on IDE activity.
-
 config PMAC_SMU
 	bool "Support for SMU  based PowerMacs"
 	depends on PPC_PMAC64
@@ -109,7 +88,7 @@ config PMAC_SMU
 
 config PMAC_APM_EMU
 	tristate "APM emulation"
-	depends on PPC_PMAC && PPC32 && PM && ADB_PMU
+	depends on PPC_PMAC && PPC32 && PM
 
 config PMAC_MEDIABAY
 	bool "Support PowerBook hotswap media bay"
@@ -120,23 +99,17 @@ config PMAC_MEDIABAY
 	  devices are not fully supported in the bay as I never had one to
 	  try with
 
+# made a separate option since backlight may end up beeing used
+# on non-powerbook machines (but only on PMU based ones AFAIK)
 config PMAC_BACKLIGHT
 	bool "Backlight control for LCD screens"
-	depends on ADB_PMU && FB = y && (BROKEN || !PPC64)
-	select FB_BACKLIGHT
-	help
-	  Say Y here to enable Macintosh specific extensions of the generic
-	  backlight code. With this enabled, the brightness keys on older
-	  PowerBooks will be enabled so you can change the screen brightness.
-	  Newer models should use an userspace daemon like pbbuttonsd.
-
-config PMAC_BACKLIGHT_LEGACY
-	bool "Provide legacy ioctl's on /dev/pmu for the backlight"
-	depends on PMAC_BACKLIGHT && (BROKEN || !PPC64)
+	depends on ADB_PMU && (BROKEN || !PPC64)
 	help
-	  Say Y if you want to enable legacy ioctl's on /dev/pmu. This is for
-	  programs which use this old interface. New and updated programs
-	  should use the backlight classes in sysfs.
+	  Say Y here to build in code to manage the LCD backlight on a
+	  Macintosh PowerBook.  With this code, the backlight will be turned
+	  on and off appropriately on power-management and lid-open/lid-closed
+	  events; also, the PowerBook button device will be enabled so you can
+	  change the screen brightness.
 
 config ADB_MACIO
 	bool "Include MacIO (CHRP) ADB driver"
@@ -198,7 +171,6 @@ config THERM_PM72
 
 config WINDFARM
 	tristate "New PowerMac thermal control infrastructure"
-	depends on PPC
 
 config WINDFARM_PM81
 	tristate "Support for thermal management on iMac G5"