Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

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

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index b6fb167..abcabb2 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -4,6 +4,8 @@
 # Andre Hedrick <andre@linux-ide.org>
 #
 
+if BLOCK
+
 menu "ATA/ATAPI/MFM/RLL support"
 
 config IDE
@@ -54,7 +56,7 @@ if IDE
 
 config IDE_MAX_HWIFS
        int "Max IDE interfaces"
-       depends on ALPHA || SUPERH || IA64
+       depends on ALPHA || SUPERH || IA64 || EMBEDDED
        default 4
        help
          This is the maximum number of IDE hardware interfaces that will
@@ -592,6 +594,12 @@ config BLK_DEV_HPT366
          ide-probe at boot. It is reported to support DVD II drives, by the
          manufacturer.
 
+config BLK_DEV_JMICRON
+       tristate "JMicron JMB36x support"
+       help
+         Basic support for the JMicron ATA controllers. For full support
+         use the libata drivers.
+
 config BLK_DEV_SC1200
        tristate "National SCx200 chipset support"
        help
@@ -1082,3 +1090,5 @@ config BLK_DEV_HD
 endif
 
 endmenu
+
+endif