hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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:
Adrian Bunk 2006-02-03 03:05:00 -08:00 committed by Linus Torvalds
parent 9ea244b4b5
commit d540c7428d
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ide/Kconfig
View File

@ -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

6
drivers/ide/pci/pdc202xx_new.c
View File

@ -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 = {
.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",

15
drivers/ide/pci/pdc202xx_old.c
View File

@ -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 = {
.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 = {
.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 = {
.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 = {
.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,
} }