[PATCH] NTP: ntp-helper functions

[linux-2.6] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index b0ace5bc950ce2c3441ddac24027f0bac45a20dc..bc3e096d84f75a5660e1c98ba9db99d955a1a075 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -4,7 +4,7 @@ menu "Macintosh device drivers"
 
 config ADB
        bool "Apple Desktop Bus (ADB) support"
-       depends on MAC || PPC_PMAC
+       depends on MAC || (PPC_PMAC && PPC32)
        help
          Apple Desktop Bus (ADB) support is for support of devices which
          are connected to an ADB port.  ADB devices tend to have 4 pins.
@@ -86,39 +86,24 @@ config PMAC_SMU
          on the "SMU" system control chip which replaces the old PMU.
          If you don't know, say Y.
 
-config PMAC_PBOOK
-       bool "Power management support for PowerBooks"
-       depends on ADB_PMU
-       ---help---
-         This provides support for putting a PowerBook to sleep; it also
-         enables media bay support.  Power management works on the
-         PB2400/3400/3500, Wallstreet, Lombard, and Bronze PowerBook G3 and
-         the Titanium Powerbook G4, as well as the iBooks.  You should get
-         the power management daemon, pmud, to make it work and you must have
-         the /dev/pmu device (see the pmud README).
-
-         Get pmud from <ftp://ftp.samba.org/pub/ppclinux/pmud/>.
-
-         If you have a PowerBook, you should say Y here.
-
-         You may also want to compile the dma sound driver as a module and
-         have it autoloaded. The act of removing the module shuts down the
-         sound hardware for more power savings.
-
-config PM
-       bool
-       depends on PPC_PMAC && ADB_PMU && PMAC_PBOOK
-       default y
-
 config PMAC_APM_EMU
        tristate "APM emulation"
-       depends on PMAC_PBOOK
+       depends on PPC_PMAC && PPC32 && PM
+
+config PMAC_MEDIABAY
+       bool "Support PowerBook hotswap media bay"
+       depends on PPC_PMAC && PPC32
+       help
+         This option adds support for older PowerBook's hotswap media bay
+         that can contains batteries, floppy drives, or IDE devices. PCI
+         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
+       depends on ADB_PMU && (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