diff options
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 04422e5e6dd8..7b24358a6f8a 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -607,7 +607,6 @@ typedef struct hwif_s { | |||
607 | unsigned reset : 1; /* reset after probe */ | 607 | unsigned reset : 1; /* reset after probe */ |
608 | unsigned auto_poll : 1; /* supports nop auto-poll */ | 608 | unsigned auto_poll : 1; /* supports nop auto-poll */ |
609 | unsigned sg_mapped : 1; /* sg_table and sg_nents are ready */ | 609 | unsigned sg_mapped : 1; /* sg_table and sg_nents are ready */ |
610 | unsigned no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */ | ||
611 | unsigned mmio : 1; /* host uses MMIO */ | 610 | unsigned mmio : 1; /* host uses MMIO */ |
612 | 611 | ||
613 | struct device gendev; | 612 | struct device gendev; |
@@ -1065,7 +1064,7 @@ enum { | |||
1065 | IDE_HFLAG_NO_SET_MODE = (1 << 9), | 1064 | IDE_HFLAG_NO_SET_MODE = (1 << 9), |
1066 | /* trust BIOS for programming chipset/device for DMA */ | 1065 | /* trust BIOS for programming chipset/device for DMA */ |
1067 | IDE_HFLAG_TRUST_BIOS_FOR_DMA = (1 << 10), | 1066 | IDE_HFLAG_TRUST_BIOS_FOR_DMA = (1 << 10), |
1068 | /* host uses VDMA */ | 1067 | /* host uses VDMA (tied with IDE_HFLAG_CS5520 for now) */ |
1069 | IDE_HFLAG_VDMA = (1 << 11), | 1068 | IDE_HFLAG_VDMA = (1 << 11), |
1070 | /* ATAPI DMA is unsupported */ | 1069 | /* ATAPI DMA is unsupported */ |
1071 | IDE_HFLAG_NO_ATAPI_DMA = (1 << 12), | 1070 | IDE_HFLAG_NO_ATAPI_DMA = (1 << 12), |
@@ -1075,8 +1074,10 @@ enum { | |||
1075 | IDE_HFLAG_NO_DMA = (1 << 14), | 1074 | IDE_HFLAG_NO_DMA = (1 << 14), |
1076 | /* check if host is PCI IDE device before allowing DMA */ | 1075 | /* check if host is PCI IDE device before allowing DMA */ |
1077 | IDE_HFLAG_NO_AUTODMA = (1 << 15), | 1076 | IDE_HFLAG_NO_AUTODMA = (1 << 15), |
1077 | /* don't autotune PIO */ | ||
1078 | IDE_HFLAG_NO_AUTOTUNE = (1 << 16), | ||
1078 | /* host is CS5510/CS5520 */ | 1079 | /* host is CS5510/CS5520 */ |
1079 | IDE_HFLAG_CS5520 = (1 << 16), | 1080 | IDE_HFLAG_CS5520 = IDE_HFLAG_VDMA, |
1080 | /* no LBA48 */ | 1081 | /* no LBA48 */ |
1081 | IDE_HFLAG_NO_LBA48 = (1 << 17), | 1082 | IDE_HFLAG_NO_LBA48 = (1 << 17), |
1082 | /* no LBA48 DMA */ | 1083 | /* no LBA48 DMA */ |
@@ -1102,8 +1103,10 @@ enum { | |||
1102 | IDE_HFLAG_CLEAR_SIMPLEX = (1 << 28), | 1103 | IDE_HFLAG_CLEAR_SIMPLEX = (1 << 28), |
1103 | /* DSC overlap is unsupported */ | 1104 | /* DSC overlap is unsupported */ |
1104 | IDE_HFLAG_NO_DSC = (1 << 29), | 1105 | IDE_HFLAG_NO_DSC = (1 << 29), |
1105 | /* don't autotune PIO */ | 1106 | /* never use 32-bit I/O ops */ |
1106 | IDE_HFLAG_NO_AUTOTUNE = (1 << 30), | 1107 | IDE_HFLAG_NO_IO_32BIT = (1 << 30), |
1108 | /* never unmask IRQs */ | ||
1109 | IDE_HFLAG_NO_UNMASK_IRQS = (1 << 31), | ||
1107 | }; | 1110 | }; |
1108 | 1111 | ||
1109 | #ifdef CONFIG_BLK_DEV_OFFBOARD | 1112 | #ifdef CONFIG_BLK_DEV_OFFBOARD |