Commit d540c742 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] IDE: always enable CONFIG_PDC202XX_FORCE

Remove the CONFIG_PDC202XX_FORCE=n case.
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9ea244b4
...@@ -673,13 +673,6 @@ config PDC202XX_BURST ...@@ -673,13 +673,6 @@ config PDC202XX_BURST
config BLK_DEV_PDC202XX_NEW config BLK_DEV_PDC202XX_NEW
tristate "PROMISE PDC202{68|69|70|71|75|76|77} support" tristate "PROMISE PDC202{68|69|70|71|75|76|77} support"
# FIXME - probably wants to be one for old and for new
config PDC202XX_FORCE
bool "Enable controller even if disabled by BIOS"
depends on BLK_DEV_PDC202XX_NEW
help
Enable the PDC202xx controller even if it has been disabled in the BIOS setup.
config BLK_DEV_SVWKS config BLK_DEV_SVWKS
tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support" tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
help help
......
...@@ -420,9 +420,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = { ...@@ -420,9 +420,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
.init_hwif = init_hwif_pdc202new, .init_hwif = init_hwif_pdc202new,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
#ifndef CONFIG_PDC202XX_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD, .bootable = OFF_BOARD,
},{ /* 3 */ },{ /* 3 */
.name = "PDC20271", .name = "PDC20271",
...@@ -447,9 +444,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = { ...@@ -447,9 +444,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
.init_hwif = init_hwif_pdc202new, .init_hwif = init_hwif_pdc202new,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
#ifndef CONFIG_PDC202XX_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD, .bootable = OFF_BOARD,
},{ /* 6 */ },{ /* 6 */
.name = "PDC20277", .name = "PDC20277",
......
...@@ -786,9 +786,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { ...@@ -786,9 +786,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
.init_dma = init_dma_pdc202xx, .init_dma = init_dma_pdc202xx,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
#ifndef CONFIG_PDC202XX_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD, .bootable = OFF_BOARD,
.extra = 16, .extra = 16,
},{ /* 1 */ },{ /* 1 */
...@@ -799,9 +796,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { ...@@ -799,9 +796,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
.init_dma = init_dma_pdc202xx, .init_dma = init_dma_pdc202xx,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
#ifndef CONFIG_PDC202XX_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD, .bootable = OFF_BOARD,
.extra = 48, .extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC, .flags = IDEPCI_FLAG_FORCE_PDC,
...@@ -813,9 +807,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { ...@@ -813,9 +807,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
.init_dma = init_dma_pdc202xx, .init_dma = init_dma_pdc202xx,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
#ifndef CONFIG_PDC202XX_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD, .bootable = OFF_BOARD,
.extra = 48, .extra = 48,
},{ /* 3 */ },{ /* 3 */
...@@ -826,9 +817,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { ...@@ -826,9 +817,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
.init_dma = init_dma_pdc202xx, .init_dma = init_dma_pdc202xx,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
#ifndef CONFIG_PDC202XX_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD, .bootable = OFF_BOARD,
.extra = 48, .extra = 48,
.flags = IDEPCI_FLAG_FORCE_PDC, .flags = IDEPCI_FLAG_FORCE_PDC,
...@@ -840,9 +828,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { ...@@ -840,9 +828,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
.init_dma = init_dma_pdc202xx, .init_dma = init_dma_pdc202xx,
.channels = 2, .channels = 2,
.autodma = AUTODMA, .autodma = AUTODMA,
#ifndef CONFIG_PDC202XX_FORCE
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
#endif
.bootable = OFF_BOARD, .bootable = OFF_BOARD,
.extra = 48, .extra = 48,
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment