Fix PDC202XX_FORCE kconfig selection
PATCH 1/1 Fix PDC202XX_FORCE kconfig selection
Split PDC202XX_FORCE selection into two independ option and allow user select it only for specific driver.
---
This patch was sent by Andrey J. Melnikoff on:
- 28 Dec 2005
drivers/ide/Kconfig | 9 +++++++-- drivers/ide/pci/pdc202xx_new.c | 4 ++-- drivers/ide/pci/pdc202xx_old.c | 10 +++++----- 3 files changed, 14 insertions(+), 9 deletions(-)
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,
Quoted 2 lines · Adrian Bunk
Split
PDC202XX_FORCEselection into two independ option and allow user select it only for specific driver.
Seems pointless. We should always grab the raid cards. The option itself is a mistake
Alan
Quoted 6 lines · Alan Cox
Quoted 2 lines · Adrian Bunk
Split
PDC202XX_FORCEselection into two independ option and allow user select it only for specific driver.Seems pointless. We should always grab the raid cards. The option itself is a mistake
Alan is right, these cards should always be grabbed in 2.6.x kernels. This option is a leftover from earlier 2.4.x days when Promise binary driver was available for using software RAID.
Could somebody submit a patch removing CONFIG_PDC202XX_FORCE?
Bartlomiej
PATCH 1/1 always enable CONFIG_PDC202XX_FORCE
Quoted 5 lines · Bartlomiej Zolnierkiewicz
Quoted 4 lines · Alan Cox
Quoted 2 lines · Adrian Bunk
Split
PDC202XX_FORCEselection into two independ option and allow user select it only for specific driver.
Quoted 8 lines
Quoted 2 lines
Seems pointless. We should always grab the raid cards. The option itself is a mistake
Alan is right, these cards should always be grabbed in 2.6.x kernels. This option is a leftover from earlier 2.4.x days when Promise binary driver was available for using software RAID.
Could somebody submit a patch removing
CONFIG_PDC202XX_FORCE?
Patch below.
Quoted 1 line
Bartlomiej
cu
Adrian
<-- snip -->
This patch removes the CONFIG_PDC202XX_FORCE=n case.
---
drivers/ide/Kconfig | 7 ------- drivers/ide/pci/pdc202xx_new.c | 6 ------ drivers/ide/pci/pdc202xx_old.c | 15 --------------- 3 files changed, 28 deletions(-)
drivers/ide/Kconfig renamed from drivers/ide/Kconfig.old +0 -7
@@ -673,13 +673,6 @@ 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
drivers/ide/pci/pdc202xx_new.c renamed from drivers/ide/pci/pdc202xx_new.c.old +0 -6
@@ -420,9 +420,6 @@ .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 @@ .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",
drivers/ide/pci/pdc202xx_old.c renamed from drivers/ide/pci/pdc202xx_old.c.old +0 -15
@@ -786,9 +786,6 @@ .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 @@ .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 @@ .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 @@ .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 @@ .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, }
Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
Quoted 1 line · Adrian Bunk
This patch removes the
CONFIG_PDC202XX_FORCE=ncase.
NAK. The Y case is the one you want to keep
Re: [2.6 patch] always enable CONFIG_PDC202XX_FORCE
Quoted 4 lines · Alan Cox
Quoted 1 line · Adrian Bunk
This patch removes the
CONFIG_PDC202XX_FORCE=ncase.NAK. The Y case is the one you want to keep
Removing the N case is the same as keeping the Y case...
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed