Fix PDC202XX_FORCE kconfig selection
PATCH 1/1 Fix PDC202XX_FORCE kconfig selection
Hello.
Split PDC202XX_FORCE selection into two independ option and allow user select it only for specific driver.
Signed-off-by Andrey Melnikov <[email protected]>
---
drivers/ide/Kconfig renamed from drivers/ide/Kconfig~ +7 -2
@@ -670,11 +670,16 @@ If unsure, say N. +config PDC202XX_OLD_FORCE + bool "Enable controller even if disabled by BIOS" + depends on BLK_DEV_PDC202XX_OLD + help + Enable the PDC202xx controller even if it has been disabled in the BIOS setup. + 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 +config PDC202XX_NEW_FORCE bool "Enable controller even if disabled by BIOS" depends on BLK_DEV_PDC202XX_NEW help
drivers/ide/pci/pdc202xx_new.c renamed from drivers/ide/pci/pdc202xx_new.c~ +2 -2
@@ -420,7 +420,7 @@ .init_hwif = init_hwif_pdc202new, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_NEW_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
@@ -447,7 +447,7 @@ .init_hwif = init_hwif_pdc202new, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_NEW_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c~ +5 -5
@@ -786,7 +786,7 @@ .init_dma = init_dma_pdc202xx, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_OLD_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
@@ -799,7 +799,7 @@ .init_dma = init_dma_pdc202xx, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_OLD_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
@@ -813,7 +813,7 @@ .init_dma = init_dma_pdc202xx, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_OLD_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
@@ -826,7 +826,7 @@ .init_dma = init_dma_pdc202xx, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_OLD_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
@@ -840,7 +840,7 @@ .init_dma = init_dma_pdc202xx, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_OLD_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
Signature · 2 lines
Best regards, TEMHOTA-RIPN aka MJA13-RIPE System Administrator. mailto:[email protected]
drivers/ide/Kconfig renamed from drivers/ide/Kconfig~ +7 -2
@@ -670,11 +670,16 @@ If unsure, say N. +config PDC202XX_OLD_FORCE + bool "Enable controller even if disabled by BIOS" + depends on BLK_DEV_PDC202XX_OLD + help + Enable the PDC202xx controller even if it has been disabled in the BIOS setup. + 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 +config PDC202XX_NEW_FORCE bool "Enable controller even if disabled by BIOS" depends on BLK_DEV_PDC202XX_NEW help
drivers/ide/pci/pdc202xx_new.c renamed from drivers/ide/pci/pdc202xx_new.c~ +2 -2
@@ -420,7 +420,7 @@ .init_hwif = init_hwif_pdc202new, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_NEW_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
@@ -447,7 +447,7 @@ .init_hwif = init_hwif_pdc202new, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_NEW_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c~ +5 -5
@@ -786,7 +786,7 @@ .init_dma = init_dma_pdc202xx, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_OLD_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
@@ -799,7 +799,7 @@ .init_dma = init_dma_pdc202xx, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_OLD_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
@@ -813,7 +813,7 @@ .init_dma = init_dma_pdc202xx, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_OLD_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
@@ -826,7 +826,7 @@ .init_dma = init_dma_pdc202xx, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_OLD_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,
@@ -840,7 +840,7 @@ .init_dma = init_dma_pdc202xx, .channels = 2, .autodma = AUTODMA, -#ifndef CONFIG_PDC202XX_FORCE +#ifndef CONFIG_PDC202XX_OLD_FORCE .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}},#endif .bootable = OFF_BOARD,