Add MMC_CAP_{MULTIWRITE,BYTEBLOCK} flags

[linux-2.6-omap-h63xx.git] / include / asm-i386 / ide.h

diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h
index 79dfab87135d5448673e92bc60d42fb5b096bf75..73465d2892b92e27183e3427dc0d4783c9b8f6b0 100644 (file)
--- a/include/asm-i386/ide.h
+++ b/include/asm-i386/ide.h
@@ -13,7 +13,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 #ifndef MAX_HWIFS
 # ifdef CONFIG_BLK_DEV_IDEPCI
@@ -41,6 +40,12 @@ static __inline__ int ide_default_irq(unsigned long base)
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
+       /*
+        *      If PCI is present then it is not safe to poke around
+        *      the other legacy IDE ports. Only 0x1f0 and 0x170 are
+        *      defined compatibility mode ports for PCI. A user can 
+        *      override this using ide= but we must default safe.
+        */
        if (pci_find_device(PCI_ANY_ID, PCI_ANY_ID, NULL) == NULL) {
                switch(index) {
                        case 2: return 0x1e8;