Merge branch 'fixes' into next

[linux.git] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 97a420c11eed59b171ce91ab5d47d1658837d08a..47c350cdfb121dba7cb04026879b644f5b34124c 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -39,17 +39,6 @@ config ADB_IOP
          <http://www.angelfire.com/ca2/dev68k/iopdesc.html> to enable direct
          support for it, say 'Y' here.
 
-config ADB_PMU68K
-       bool "Include PMU (Powerbook) ADB driver"
-       depends on ADB && MAC
-       help
-         Say Y here if want your kernel to support the m68k based Powerbooks.
-         This includes the PowerBook 140, PowerBook 145, PowerBook 150,
-         PowerBook 160, PowerBook 165, PowerBook 165c, PowerBook 170,
-         PowerBook 180, PowerBook, 180c, PowerBook 190cs, PowerBook 520,
-         PowerBook Duo 210, PowerBook Duo 230, PowerBook Duo 250,
-         PowerBook Duo 270c, PowerBook Duo 280 and PowerBook Duo 280c.
-
 # we want to change this to something like CONFIG_SYSCTRL_CUDA/PMU
 config ADB_CUDA
        bool "Support for Cuda/Egret based Macs and PowerMacs"
@@ -65,8 +54,8 @@ config ADB_CUDA
          If unsure say Y.
 
 config ADB_PMU
-       bool "Support for PMU  based PowerMacs"
-       depends on PPC_PMAC
+       bool "Support for PMU based PowerMacs and PowerBooks"
+       depends on PPC_PMAC || MAC
        help
          On PowerBooks, iBooks, and recent iMacs and Power Macintoshes, the
          PMU is an embedded microprocessor whose primary function is to
@@ -79,7 +68,7 @@ config ADB_PMU
 
 config ADB_PMU_LED
        bool "Support for the Power/iBook front LED"
-       depends on ADB_PMU
+       depends on PPC_PMAC && ADB_PMU
        select NEW_LEDS
        select LEDS_CLASS
        help
@@ -122,7 +111,7 @@ config PMAC_MEDIABAY
 
 config PMAC_BACKLIGHT
        bool "Backlight control for LCD screens"
-       depends on ADB_PMU && FB = y && (BROKEN || !PPC64)
+       depends on PPC_PMAC && ADB_PMU && FB = y && (BROKEN || !PPC64)
        select FB_BACKLIGHT
        help
          Say Y here to enable Macintosh specific extensions of the generic