Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

[pandora-kernel.git] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index ccf5df4..92ccee8 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -78,6 +78,27 @@ 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
@@ -88,7 +109,7 @@ config PMAC_SMU
 
 config PMAC_APM_EMU
        tristate "APM emulation"
-       depends on PPC_PMAC && PPC32 && PM
+       depends on PPC_PMAC && PPC32 && PM && ADB_PMU
 
 config PMAC_MEDIABAY
        bool "Support PowerBook hotswap media bay"
@@ -99,17 +120,23 @@ 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 && (BROKEN || !PPC64)
+       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)
        help
-         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.
+         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.
 
 config ADB_MACIO
        bool "Include MacIO (CHRP) ADB driver"
@@ -159,7 +186,7 @@ config THERM_ADT746X
        depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
        help
          This driver provides some thermostat and fan control for the
-          iBook G4, and the ATI based aluminium PowerBooks, allowing slighlty
+          iBook G4, and the ATI based aluminium PowerBooks, allowing slightly
          better fan behaviour by default, and some manual control.
 
 config THERM_PM72
@@ -201,4 +228,11 @@ config ANSLCD
        tristate "Support for ANS LCD display"
        depends on ADB_CUDA && PPC_PMAC
 
+config PMAC_RACKMETER
+       tristate "Support for Apple XServe front panel LEDs"
+       depends on PPC_PMAC
+       help
+         This driver procides some support to control the front panel
+          blue LEDs "vu-meter" of the XServer macs.
+
 endmenu