[PATCH] irq-flags: isdn: Use the new IRQF_ constants

[powerpc.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index b750ad4..d1266fe 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -673,13 +673,6 @@ config PDC202XX_BURST
 config BLK_DEV_PDC202XX_NEW
        tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
 
-# FIXME - probably wants to be one for old and for new
-config PDC202XX_FORCE
-       bool "Enable controller even if disabled by BIOS"
-       depends on BLK_DEV_PDC202XX_NEW
-       help
-         Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
-
 config BLK_DEV_SVWKS
        tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
        help
@@ -781,11 +774,18 @@ config BLK_DEV_IDEDMA_PMAC
          performance.
 
 config BLK_DEV_IDE_PMAC_BLINK
-       bool "Blink laptop LED on drive activity"
+       bool "Blink laptop LED on drive activity (DEPRECATED)"
        depends on BLK_DEV_IDE_PMAC && ADB_PMU
+       select ADB_PMU_LED
+       select LEDS_TRIGGERS
+       select LEDS_TRIGGER_IDE_DISK
        help
          This option enables the use of the sleep LED as a hard drive
          activity LED.
+         This option is deprecated, it only selects ADB_PMU_LED and
+         LEDS_TRIGGER_IDE_DISK and changes the code in the new led class
+         device to default to the ide-disk trigger (which should be set
+         from userspace via sysfs).
 
 config BLK_DEV_IDE_SWARM
        tristate "IDE for Sibyte evaluation boards"