[PATCH] IDE: always enable CONFIG_PDC202XX_FORCE

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Adrian Bunk and committed by

Linus Torvalds 20 years ago d540c742 9ea244b4

-28

3 changed files

expand all

drivers

ide

Kconfig

pci

pdc202xx_new.c

pdc202xx_old.c

-7

drivers/ide/Kconfig

··· 673 673 config BLK_DEV_PDC202XX_NEW 674 674 tristate "PROMISE PDC202{68|69|70|71|75|76|77} support" 675 675 676 - # FIXME - probably wants to be one for old and for new 677 - config PDC202XX_FORCE 678 - bool "Enable controller even if disabled by BIOS" 679 - depends on BLK_DEV_PDC202XX_NEW 680 - help 681 - Enable the PDC202xx controller even if it has been disabled in the BIOS setup. 682 - 683 676 config BLK_DEV_SVWKS 684 677 tristate "ServerWorks OSB4/CSB5/CSB6 chipsets support" 685 678 help

-6

drivers/ide/pci/pdc202xx_new.c

··· 420 420 .init_hwif = init_hwif_pdc202new, 421 421 .channels = 2, 422 422 .autodma = AUTODMA, 423 - #ifndef CONFIG_PDC202XX_FORCE 424 - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, 425 - #endif 426 423 .bootable = OFF_BOARD, 427 424 },{ /* 3 */ 428 425 .name = "PDC20271", ··· 444 447 .init_hwif = init_hwif_pdc202new, 445 448 .channels = 2, 446 449 .autodma = AUTODMA, 447 - #ifndef CONFIG_PDC202XX_FORCE 448 - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, 449 - #endif 450 450 .bootable = OFF_BOARD, 451 451 },{ /* 6 */ 452 452 .name = "PDC20277",

-15

drivers/ide/pci/pdc202xx_old.c

··· 786 786 .init_dma = init_dma_pdc202xx, 787 787 .channels = 2, 788 788 .autodma = AUTODMA, 789 - #ifndef CONFIG_PDC202XX_FORCE 790 - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, 791 - #endif 792 789 .bootable = OFF_BOARD, 793 790 .extra = 16, 794 791 },{ /* 1 */ ··· 796 799 .init_dma = init_dma_pdc202xx, 797 800 .channels = 2, 798 801 .autodma = AUTODMA, 799 - #ifndef CONFIG_PDC202XX_FORCE 800 - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, 801 - #endif 802 802 .bootable = OFF_BOARD, 803 803 .extra = 48, 804 804 .flags = IDEPCI_FLAG_FORCE_PDC, ··· 807 813 .init_dma = init_dma_pdc202xx, 808 814 .channels = 2, 809 815 .autodma = AUTODMA, 810 - #ifndef CONFIG_PDC202XX_FORCE 811 - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, 812 - #endif 813 816 .bootable = OFF_BOARD, 814 817 .extra = 48, 815 818 },{ /* 3 */ ··· 817 826 .init_dma = init_dma_pdc202xx, 818 827 .channels = 2, 819 828 .autodma = AUTODMA, 820 - #ifndef CONFIG_PDC202XX_FORCE 821 - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, 822 - #endif 823 829 .bootable = OFF_BOARD, 824 830 .extra = 48, 825 831 .flags = IDEPCI_FLAG_FORCE_PDC, ··· 828 840 .init_dma = init_dma_pdc202xx, 829 841 .channels = 2, 830 842 .autodma = AUTODMA, 831 - #ifndef CONFIG_PDC202XX_FORCE 832 - .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, 833 - #endif 834 843 .bootable = OFF_BOARD, 835 844 .extra = 48, 836 845 }