diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 11:36:35 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 11:36:35 -0400 |
commit | 5e71d9c5a50b92b33d35061d42ac39166db9578e (patch) | |
tree | bbf006e6e64f2d8828766f44249d6d26150ae3a4 /drivers/ide/pci/serverworks.c | |
parent | 7daf66dd142b1978bf8670d9d959d835de37476f (diff) |
ide: IDE_HFLAG_BOOTABLE -> IDE_HFLAG_NON_BOOTABLE
"bootable" should be the default behavior so replace
IDE_HFLAG_BOOTABLE host flag with IDE_HFLAG_NON_BOOTABLE.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/serverworks.c')
-rw-r--r-- | drivers/ide/pci/serverworks.c | 5 |
1 files changed, 2 insertions, 3 deletions
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) | |||
350 | 350 | ||
351 | #define IDE_HFLAGS_SVWKS \ | 351 | #define IDE_HFLAGS_SVWKS \ |
352 | (IDE_HFLAG_LEGACY_IRQS | \ | 352 | (IDE_HFLAG_LEGACY_IRQS | \ |
353 | IDE_HFLAG_ABUSE_SET_DMA_MODE | \ | 353 | IDE_HFLAG_ABUSE_SET_DMA_MODE) |
354 | IDE_HFLAG_BOOTABLE) | ||
355 | 354 | ||
356 | static const struct ide_port_info serverworks_chipsets[] __devinitdata = { | 355 | static const struct ide_port_info serverworks_chipsets[] __devinitdata = { |
357 | { /* 0 */ | 356 | { /* 0 */ |
@@ -418,7 +417,7 @@ static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device | |||
418 | else if (idx == 2 || idx == 3) { | 417 | else if (idx == 2 || idx == 3) { |
419 | if ((PCI_FUNC(dev->devfn) & 1) == 0) { | 418 | if ((PCI_FUNC(dev->devfn) & 1) == 0) { |
420 | if (pci_resource_start(dev, 0) != 0x01f1) | 419 | if (pci_resource_start(dev, 0) != 0x01f1) |
421 | d.host_flags &= ~IDE_HFLAG_BOOTABLE; | 420 | d.host_flags |= IDE_HFLAG_NON_BOOTABLE; |
422 | d.host_flags |= IDE_HFLAG_SINGLE; | 421 | d.host_flags |= IDE_HFLAG_SINGLE; |
423 | } else | 422 | } else |
424 | d.host_flags &= ~IDE_HFLAG_SINGLE; | 423 | d.host_flags &= ~IDE_HFLAG_SINGLE; |