forked from luck/tmp_suning_uos_patched
[PATCH] IDE: always enable CONFIG_PDC202XX_FORCE
Remove the CONFIG_PDC202XX_FORCE=n case. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
9ea244b4b5
commit
d540c7428d
|
@ -673,13 +673,6 @@ config PDC202XX_BURST
|
|||
config BLK_DEV_PDC202XX_NEW
|
||||
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
|
||||
tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support"
|
||||
help
|
||||
|
|
|
@ -420,9 +420,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
|
|||
.init_hwif = init_hwif_pdc202new,
|
||||
.channels = 2,
|
||||
.autodma = AUTODMA,
|
||||
#ifndef CONFIG_PDC202XX_FORCE
|
||||
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
|
||||
#endif
|
||||
.bootable = OFF_BOARD,
|
||||
},{ /* 3 */
|
||||
.name = "PDC20271",
|
||||
|
@ -447,9 +444,6 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
|
|||
.init_hwif = init_hwif_pdc202new,
|
||||
.channels = 2,
|
||||
.autodma = AUTODMA,
|
||||
#ifndef CONFIG_PDC202XX_FORCE
|
||||
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
|
||||
#endif
|
||||
.bootable = OFF_BOARD,
|
||||
},{ /* 6 */
|
||||
.name = "PDC20277",
|
||||
|
|
|
@ -786,9 +786,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
|
|||
.init_dma = init_dma_pdc202xx,
|
||||
.channels = 2,
|
||||
.autodma = AUTODMA,
|
||||
#ifndef CONFIG_PDC202XX_FORCE
|
||||
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
|
||||
#endif
|
||||
.bootable = OFF_BOARD,
|
||||
.extra = 16,
|
||||
},{ /* 1 */
|
||||
|
@ -799,9 +796,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
|
|||
.init_dma = init_dma_pdc202xx,
|
||||
.channels = 2,
|
||||
.autodma = AUTODMA,
|
||||
#ifndef CONFIG_PDC202XX_FORCE
|
||||
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
|
||||
#endif
|
||||
.bootable = OFF_BOARD,
|
||||
.extra = 48,
|
||||
.flags = IDEPCI_FLAG_FORCE_PDC,
|
||||
|
@ -813,9 +807,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
|
|||
.init_dma = init_dma_pdc202xx,
|
||||
.channels = 2,
|
||||
.autodma = AUTODMA,
|
||||
#ifndef CONFIG_PDC202XX_FORCE
|
||||
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
|
||||
#endif
|
||||
.bootable = OFF_BOARD,
|
||||
.extra = 48,
|
||||
},{ /* 3 */
|
||||
|
@ -826,9 +817,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
|
|||
.init_dma = init_dma_pdc202xx,
|
||||
.channels = 2,
|
||||
.autodma = AUTODMA,
|
||||
#ifndef CONFIG_PDC202XX_FORCE
|
||||
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
|
||||
#endif
|
||||
.bootable = OFF_BOARD,
|
||||
.extra = 48,
|
||||
.flags = IDEPCI_FLAG_FORCE_PDC,
|
||||
|
@ -840,9 +828,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
|
|||
.init_dma = init_dma_pdc202xx,
|
||||
.channels = 2,
|
||||
.autodma = AUTODMA,
|
||||
#ifndef CONFIG_PDC202XX_FORCE
|
||||
.enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},
|
||||
#endif
|
||||
.bootable = OFF_BOARD,
|
||||
.extra = 48,
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user