31 files changed, 37 insertions, 60 deletions

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index cfb3265bc1a8..c9ba15afe97d 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -220,7 +220,8 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_aec62xx,
                 .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
                 .host_flags     = IDE_HFLAG_NO_ATAPI_DMA |
-                                  IDE_HFLAG_ABUSE_SET_DMA_MODE,
+                                  IDE_HFLAG_ABUSE_SET_DMA_MODE |
+                                  IDE_HFLAG_NON_BOOTABLE,
                 .pio_mask       = ATA_PIO4,
                 .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA4,
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index b3b6f514ce2d..3fa2d9f7b1b2 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -750,7 +750,6 @@ static const struct ide_port_info ali15x3_chipset __devinitdata = {
         .init_chipset   = init_chipset_ali15x3,
         .init_hwif      = init_hwif_ali15x3,
         .init_dma       = init_dma_ali15x3,
-        .host_flags     = IDE_HFLAG_BOOTABLE,
         .pio_mask       = ATA_PIO5,
         .swdma_mask     = ATA_SWDMA2,
         .mwdma_mask     = ATA_MWDMA2,
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 2ef890ce8097..68517267d31e 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -223,8 +223,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
          IDE_HFLAG_ABUSE_SET_DMA_MODE | \
          IDE_HFLAG_POST_SET_MODE | \
          IDE_HFLAG_IO_32BIT | \
-         IDE_HFLAG_UNMASK_IRQS | \
-         IDE_HFLAG_BOOTABLE)
+         IDE_HFLAG_UNMASK_IRQS)
 
 #define DECLARE_AMD_DEV(name_str, swdma, udma)                          \
         {                                                               \
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 7e037c880cb0..91722f88b7bd 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -151,7 +151,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
                 .name           = "ATIIXP",
                 .init_hwif      = init_hwif_atiixp,
                 .enablebits     = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
-                .host_flags     = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,
+                .host_flags     = IDE_HFLAG_LEGACY_IRQS,
                 .pio_mask       = ATA_PIO4,
                 .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5,
@@ -159,8 +159,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
                 .name           = "SB600_PATA",
                 .init_hwif      = init_hwif_atiixp,
                 .enablebits     = {{0x48,0x01,0x00}, {0x00,0x00,0x00}},
-                .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_LEGACY_IRQS |
-                                  IDE_HFLAG_BOOTABLE,
+                .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_LEGACY_IRQS,
                 .pio_mask       = ATA_PIO4,
                 .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5,
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index edabe6299efd..8baccfef237f 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -440,8 +440,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_cmd64x,
                 .enablebits     = {{0x00,0x00,0x00}, {0x51,0x08,0x08}},
                 .host_flags     = IDE_HFLAG_CLEAR_SIMPLEX |
-                                  IDE_HFLAG_ABUSE_PREFETCH |
-                                  IDE_HFLAG_BOOTABLE,
+                                  IDE_HFLAG_ABUSE_PREFETCH,
                 .pio_mask       = ATA_PIO5,
                 .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = 0x00, /* no udma */
@@ -451,7 +450,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_cmd64x,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .chipset        = ide_cmd646,
-                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
+                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
                 .pio_mask       = ATA_PIO5,
                 .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA2,
@@ -460,7 +459,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
                 .init_chipset   = init_chipset_cmd64x,
                 .init_hwif      = init_hwif_cmd64x,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
-                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
+                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
                 .pio_mask       = ATA_PIO5,
                 .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA4,
@@ -469,7 +468,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
                 .init_chipset   = init_chipset_cmd64x,
                 .init_hwif      = init_hwif_cmd64x,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
-                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
+                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
                 .pio_mask       = ATA_PIO5,
                 .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA5,
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index 1c163e4ef03f..01b37ecb5a5a 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -122,8 +122,7 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
                                   IDE_HFLAG_CS5520 |            \
                                   IDE_HFLAG_VDMA |              \
                                   IDE_HFLAG_NO_ATAPI_DMA |      \
-                                  IDE_HFLAG_ABUSE_SET_DMA_MODE |\
-                                  IDE_HFLAG_BOOTABLE,           \
+                                  IDE_HFLAG_ABUSE_SET_DMA_MODE, \
                 .pio_mask       = ATA_PIO4,                     \
         }
 
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 941a1344820b..56a369c2a78a 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -249,8 +249,7 @@ static const struct ide_port_info cs5530_chipset __devinitdata = {
         .init_chipset   = init_chipset_cs5530,
         .init_hwif      = init_hwif_cs5530,
         .host_flags     = IDE_HFLAG_SERIALIZE |
-                          IDE_HFLAG_POST_SET_MODE |
-                          IDE_HFLAG_BOOTABLE,
+                          IDE_HFLAG_POST_SET_MODE,
         .pio_mask       = ATA_PIO4,
         .mwdma_mask     = ATA_MWDMA2,
         .udma_mask      = ATA_UDMA2,
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index d7b5ea992e94..c9685f239c65 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -186,7 +186,7 @@ static const struct ide_port_info cs5535_chipset __devinitdata = {
         .name           = "CS5535",
         .init_hwif      = init_hwif_cs5535,
         .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE |
-                          IDE_HFLAG_ABUSE_SET_DMA_MODE | IDE_HFLAG_BOOTABLE,
+                          IDE_HFLAG_ABUSE_SET_DMA_MODE,
         .pio_mask       = ATA_PIO4,
         .mwdma_mask     = ATA_MWDMA2,
         .udma_mask      = ATA_UDMA4,
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 724cbacf4e5b..f68b89a05823 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -410,8 +410,7 @@ static const struct ide_port_info cy82c693_chipset __devinitdata = {
         .init_iops      = init_iops_cy82c693,
         .init_hwif      = init_hwif_cy82c693,
         .chipset        = ide_cy82c693,
-        .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_CY82C693 |
-                          IDE_HFLAG_BOOTABLE,
+        .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_CY82C693,
         .pio_mask       = ATA_PIO4,
         .swdma_mask     = ATA_SWDMA2,
         .mwdma_mask     = ATA_MWDMA2,
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 7fd83a9d4dee..f83afa10d3ca 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -38,8 +38,7 @@ MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE st
         { \
                 .name           = name_str, \
                 .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA | \
-                                  extra_flags | \
-                                  IDE_HFLAG_BOOTABLE, \
+                                  extra_flags, \
                 .swdma_mask     = ATA_SWDMA2, \
                 .mwdma_mask     = ATA_MWDMA2, \
                 .udma_mask      = ATA_UDMA6, \
@@ -51,8 +50,7 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = {
         {       /* 1 */
                 .name           = "NS87410",
                 .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
-                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
-                                  IDE_HFLAG_BOOTABLE,
+                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
                 .swdma_mask     = ATA_SWDMA2,
                 .mwdma_mask     = ATA_MWDMA2,
                 .udma_mask      = ATA_UDMA6,
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 9f01da46b016..9f2fc3094000 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -133,7 +133,7 @@ static const struct ide_port_info hpt34x_chipsets[] __devinitdata = {
                 .init_chipset   = init_chipset_hpt34x,
                 .init_hwif      = init_hwif_hpt34x,
                 .extra          = 16,
-                .host_flags     = IDE_HFLAGS_HPT34X,
+                .host_flags     = IDE_HFLAGS_HPT34X | IDE_HFLAG_NON_BOOTABLE,
                 .pio_mask       = ATA_PIO5,
         },
         { /* 1 */
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 82d0e318a1fe..a49090672145 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1557,7 +1557,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
                         hpt374_init(dev, dev2);
                 else {
                         if (hpt36x_init(dev, dev2))
-                                d.host_flags |= IDE_HFLAG_BOOTABLE;
+                                d.host_flags &= ~IDE_HFLAG_NON_BOOTABLE;
                 }
 
                 ret = ide_setup_pci_devices(dev, dev2, &d);
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index e3427eaab430..a5ba7e8b55cc 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -171,8 +171,7 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
                 .name           = name_str,             \
                 .init_hwif      = init_hwif_it8213,     \
                 .enablebits     = {{0x41,0x80,0x80}}, \
-                .host_flags     = IDE_HFLAG_SINGLE |    \
-                                  IDE_HFLAG_BOOTABLE,   \
+                .host_flags     = IDE_HFLAG_SINGLE,     \
                 .pio_mask       = ATA_PIO4,             \
                 .swdma_mask     = ATA_SWDMA2_ONLY,      \
                 .mwdma_mask     = ATA_MWDMA12_ONLY,     \
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index d8a167451fd6..b9f9e0d78f84 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -623,7 +623,6 @@ static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const cha
                 .name           = name_str,             \
                 .init_chipset   = init_chipset_it821x,  \
                 .init_hwif      = init_hwif_it821x,     \
-                .host_flags     = IDE_HFLAG_BOOTABLE,   \
                 .pio_mask       = ATA_PIO4,             \
         }
 
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index a56bcb4f22f4..440266fad98e 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -114,7 +114,6 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
 static const struct ide_port_info jmicron_chipset __devinitdata = {
         .name           = "JMB",
         .init_hwif      = init_hwif_jmicron,
-        .host_flags     = IDE_HFLAG_BOOTABLE,
         .enablebits     = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
         .pio_mask       = ATA_PIO5,
         .mwdma_mask     = ATA_MWDMA2,
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index 75513320aad9..3015d6916d4c 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -265,8 +265,7 @@ static const struct ide_port_info ns87415_chipset __devinitdata = {
 #endif
         .init_hwif      = init_hwif_ns87415,
         .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
-                          IDE_HFLAG_NO_ATAPI_DMA |
-                          IDE_HFLAG_BOOTABLE,
+                          IDE_HFLAG_NO_ATAPI_DMA,
 };
 
 static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 46e8748f507e..cfd46ae11428 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -335,8 +335,7 @@ static const struct ide_port_info opti621_chipsets[] __devinitdata = {
                 .name           = "OPTI621",
                 .init_hwif      = init_hwif_opti621,
                 .enablebits     = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
-                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
-                                  IDE_HFLAG_BOOTABLE,
+                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
                 .pio_mask       = ATA_PIO3,
                 .swdma_mask     = ATA_SWDMA2,
                 .mwdma_mask     = ATA_MWDMA2,
@@ -344,8 +343,7 @@ static const struct ide_port_info opti621_chipsets[] __devinitdata = {
                 .name           = "OPTI621X",
                 .init_hwif      = init_hwif_opti621,
                 .enablebits     = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
-                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
-                                  IDE_HFLAG_BOOTABLE,
+                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
                 .pio_mask       = ATA_PIO3,
                 .swdma_mask     = ATA_SWDMA2,
                 .mwdma_mask     = ATA_MWDMA2,
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index decef0f47674..89d74ffdb207 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -307,9 +307,9 @@ static void __devinit init_hwif_ich(ide_hwif_t *hwif)
 }
 
 #ifndef CONFIG_IA64
- #define IDE_HFLAGS_PIIX (IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE)
+ #define IDE_HFLAGS_PIIX IDE_HFLAG_LEGACY_IRQS
 #else
- #define IDE_HFLAGS_PIIX IDE_HFLAG_BOOTABLE
+ #define IDE_HFLAGS_PIIX 0
 #endif
 
 #define DECLARE_PIIX_DEV(name_str, udma) \
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index 51676612f78f..532154adba29 100644
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -43,7 +43,7 @@ static const struct ide_port_info rz1000_chipset __devinitdata = {
         .name           = "RZ100x",
         .init_hwif      = init_hwif_rz1000,
         .chipset        = ide_rz1000,
-        .host_flags     = IDE_HFLAG_NO_DMA | IDE_HFLAG_BOOTABLE,
+        .host_flags     = IDE_HFLAG_NO_DMA,
 };
 
 static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id)
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 561aa47c7720..44985c8f36e7 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -307,8 +307,7 @@ static const struct ide_port_info sc1200_chipset __devinitdata = {
         .init_hwif      = init_hwif_sc1200,
         .host_flags     = IDE_HFLAG_SERIALIZE |
                           IDE_HFLAG_POST_SET_MODE |
-                          IDE_HFLAG_ABUSE_DMA_MODES |
-                          IDE_HFLAG_BOOTABLE,
+                          IDE_HFLAG_ABUSE_DMA_MODES,
         .pio_mask       = ATA_PIO4,
         .mwdma_mask     = ATA_MWDMA2,
         .udma_mask      = ATA_UDMA2,
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 0d1e4fc86ca6..52145796f12f 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -721,8 +721,7 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
       .name             = name_str,                     \
       .init_iops        = init_iops_scc,                \
       .init_hwif        = init_hwif_scc,                \
-      .host_flags       = IDE_HFLAG_SINGLE |            \
-                          IDE_HFLAG_BOOTABLE,           \
+      .host_flags       = IDE_HFLAG_SINGLE,             \
       .pio_mask         = ATA_PIO4,                     \
   }
 
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index c11880b0709f..cfe927469793 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -350,8 +350,7 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
 
 #define IDE_HFLAGS_SVWKS \
         (IDE_HFLAG_LEGACY_IRQS | \
-         IDE_HFLAG_ABUSE_SET_DMA_MODE | \
-         IDE_HFLAG_BOOTABLE)
+         IDE_HFLAG_ABUSE_SET_DMA_MODE)
 
 static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
         {       /* 0 */
@@ -418,7 +417,7 @@ static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device
         else if (idx == 2 || idx == 3) {
                 if ((PCI_FUNC(dev->devfn) & 1) == 0) {
                         if (pci_resource_start(dev, 0) != 0x01f1)
-                                d.host_flags &= ~IDE_HFLAG_BOOTABLE;
+                                d.host_flags |= IDE_HFLAG_NON_BOOTABLE;
                         d.host_flags |= IDE_HFLAG_SINGLE;
                 } else
                         d.host_flags &= ~IDE_HFLAG_SINGLE;
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index b6be1b45f329..c9ecab8aeb61 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -808,7 +808,6 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
                 .init_chipset   = init_chipset_siimage, \
                 .init_iops      = init_iops_siimage,    \
                 .init_hwif      = init_hwif_siimage,    \
-                .host_flags     = IDE_HFLAG_BOOTABLE,   \
                 .pio_mask       = ATA_PIO4,             \
                 .mwdma_mask     = ATA_MWDMA2,           \
                 .udma_mask      = ATA_UDMA6,            \
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 512bb4c1fd5c..e29c90f045d5 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -569,8 +569,7 @@ static const struct ide_port_info sis5513_chipset __devinitdata = {
         .init_chipset   = init_chipset_sis5513,
         .init_hwif      = init_hwif_sis5513,
         .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
-        .host_flags     = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_NO_AUTODMA |
-                          IDE_HFLAG_BOOTABLE,
+        .host_flags     = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_NO_AUTODMA,
         .pio_mask       = ATA_PIO4,
         .mwdma_mask     = ATA_MWDMA2,
 };
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 1f00251a4a87..40b3eeb2d847 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -332,8 +332,7 @@ static const struct ide_port_info sl82c105_chipset __devinitdata = {
 #if defined(CONFIG_LOPEC) || defined(CONFIG_SANDPOINT)
                           IDE_HFLAG_FORCE_LEGACY_IRQS |
 #endif
-                          IDE_HFLAG_NO_AUTODMA |
-                          IDE_HFLAG_BOOTABLE,
+                          IDE_HFLAG_NO_AUTODMA,
         .pio_mask       = ATA_PIO5,
 };
 
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 65f4c2ffaa59..2ce384ad6caa 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -137,7 +137,7 @@ static const struct ide_port_info slc90e66_chipset __devinitdata = {
         .name           = "SLC90E66",
         .init_hwif      = init_hwif_slc90e66,
         .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
-        .host_flags     = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,
+        .host_flags     = IDE_HFLAG_LEGACY_IRQS,
         .pio_mask       = ATA_PIO4,
         .swdma_mask     = ATA_SWDMA2_ONLY,
         .mwdma_mask     = ATA_MWDMA12_ONLY,
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index a67d02a3f96e..3316b197c779 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -97,7 +97,6 @@ static const struct ide_port_info triflex_device __devinitdata = {
         .name           = "TRIFLEX",
         .init_hwif      = init_hwif_triflex,
         .enablebits     = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
-        .host_flags     = IDE_HFLAG_BOOTABLE,
         .pio_mask       = ATA_PIO4,
         .swdma_mask     = ATA_SWDMA2,
         .mwdma_mask     = ATA_MWDMA2,
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index de750f7a43e9..2b8f3a2837d7 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -337,7 +337,6 @@ static const struct ide_port_info trm290_chipset __devinitdata = {
                           IDE_HFLAG_TRUST_BIOS_FOR_DMA |
 #endif
                           IDE_HFLAG_NO_AUTODMA |
-                          IDE_HFLAG_BOOTABLE |
                           IDE_HFLAG_NO_LBA48,
 };
 
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 9004e7521889..b55d2e4d3506 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -432,8 +432,7 @@ static const struct ide_port_info via82cxxx_chipset __devinitdata = {
                           IDE_HFLAG_PIO_NO_DOWNGRADE |
                           IDE_HFLAG_ABUSE_SET_DMA_MODE |
                           IDE_HFLAG_POST_SET_MODE |
-                          IDE_HFLAG_IO_32BIT |
-                          IDE_HFLAG_BOOTABLE,
+                          IDE_HFLAG_IO_32BIT,
         .pio_mask       = ATA_PIO5,
         .swdma_mask     = ATA_SWDMA2,
         .mwdma_mask     = ATA_MWDMA2,
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 7347faf8bc41..8947597e6bec 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -320,7 +320,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev,
 {
         unsigned long ctl = 0, base = 0;
         ide_hwif_t *hwif;
-        u8 bootable = (d->host_flags & IDE_HFLAG_BOOTABLE) ? 1 : 0;
+        u8 bootable = (d->host_flags & IDE_HFLAG_NON_BOOTABLE) ? 0 : 1;
         struct hw_regs_s hw;
 
         if ((d->host_flags & IDE_HFLAG_ISA_PORTS) == 0) {
diff --git a/include/linux/ide.h b/include/linux/ide.h
index c5728dd5d9d9..eccc42b47061 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1050,8 +1050,8 @@ enum {
         IDE_HFLAG_VDMA                  = (1 << 11),
         /* ATAPI DMA is unsupported */
         IDE_HFLAG_NO_ATAPI_DMA          = (1 << 12),
-        /* set if host is a "bootable" controller */
-        IDE_HFLAG_BOOTABLE              = (1 << 13),
+        /* set if host is a "non-bootable" controller */
+        IDE_HFLAG_NON_BOOTABLE          = (1 << 13),
         /* host doesn't support DMA */
         IDE_HFLAG_NO_DMA                = (1 << 14),
         /* check if host is PCI IDE device before allowing DMA */
@@ -1092,9 +1092,9 @@ enum {
 };
 
 #ifdef CONFIG_BLK_DEV_OFFBOARD
-# define IDE_HFLAG_OFF_BOARD    IDE_HFLAG_BOOTABLE
-#else
 # define IDE_HFLAG_OFF_BOARD    0
+#else
+# define IDE_HFLAG_OFF_BOARD    IDE_HFLAG_NON_BOOTABLE
 #endif
 
 struct ide_port_info {