Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / drivers / macintosh / Kconfig

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index a32c91e27b3c466a98e3b6ee2b66d612f3255e88..f44c94abd883f9b8731df64f1e0e37ce39766ee8 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -113,7 +113,6 @@ config PMAC_SMU
 
 config PMAC_APM_EMU
        tristate "APM emulation"
-       select SYS_SUPPORTS_APM_EMULATION
        select APM_EMULATION
        depends on ADB_PMU && PM
 
@@ -237,7 +236,7 @@ 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
+         This driver provides some support to control the front panel
           blue LEDs "vu-meter" of the XServer macs.
 
 endif # MACINTOSH_DRIVERS