diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-02-03 06:05:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 11:32:13 -0500 |
| commit | d540c7428d297ab041e6cac72b9045e7b8f93f2b (patch) | |
| tree | 6a8dd4040568124b2ff6ff375f2ef00f347f531c /drivers/ide/pci/pdc202xx_old.c | |
| parent | 9ea244b4b545ecb323d042a0df5c080edefcd1fc (diff) | |
[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>
Diffstat (limited to 'drivers/ide/pci/pdc202xx_old.c')
| -rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index ad9d95817f95..6f8f8645b02c 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
| @@ -786,9 +786,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { | |||
| 786 | .init_dma = init_dma_pdc202xx, | 786 | .init_dma = init_dma_pdc202xx, |
| 787 | .channels = 2, | 787 | .channels = 2, |
| 788 | .autodma = AUTODMA, | 788 | .autodma = AUTODMA, |
| 789 | #ifndef CONFIG_PDC202XX_FORCE | ||
| 790 | .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, | ||
| 791 | #endif | ||
| 792 | .bootable = OFF_BOARD, | 789 | .bootable = OFF_BOARD, |
| 793 | .extra = 16, | 790 | .extra = 16, |
| 794 | },{ /* 1 */ | 791 | },{ /* 1 */ |
| @@ -799,9 +796,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { | |||
| 799 | .init_dma = init_dma_pdc202xx, | 796 | .init_dma = init_dma_pdc202xx, |
| 800 | .channels = 2, | 797 | .channels = 2, |
| 801 | .autodma = AUTODMA, | 798 | .autodma = AUTODMA, |
| 802 | #ifndef CONFIG_PDC202XX_FORCE | ||
| 803 | .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, | ||
| 804 | #endif | ||
| 805 | .bootable = OFF_BOARD, | 799 | .bootable = OFF_BOARD, |
| 806 | .extra = 48, | 800 | .extra = 48, |
| 807 | .flags = IDEPCI_FLAG_FORCE_PDC, | 801 | .flags = IDEPCI_FLAG_FORCE_PDC, |
| @@ -813,9 +807,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { | |||
| 813 | .init_dma = init_dma_pdc202xx, | 807 | .init_dma = init_dma_pdc202xx, |
| 814 | .channels = 2, | 808 | .channels = 2, |
| 815 | .autodma = AUTODMA, | 809 | .autodma = AUTODMA, |
| 816 | #ifndef CONFIG_PDC202XX_FORCE | ||
| 817 | .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, | ||
| 818 | #endif | ||
| 819 | .bootable = OFF_BOARD, | 810 | .bootable = OFF_BOARD, |
| 820 | .extra = 48, | 811 | .extra = 48, |
| 821 | },{ /* 3 */ | 812 | },{ /* 3 */ |
| @@ -826,9 +817,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { | |||
| 826 | .init_dma = init_dma_pdc202xx, | 817 | .init_dma = init_dma_pdc202xx, |
| 827 | .channels = 2, | 818 | .channels = 2, |
| 828 | .autodma = AUTODMA, | 819 | .autodma = AUTODMA, |
| 829 | #ifndef CONFIG_PDC202XX_FORCE | ||
| 830 | .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, | ||
| 831 | #endif | ||
| 832 | .bootable = OFF_BOARD, | 820 | .bootable = OFF_BOARD, |
| 833 | .extra = 48, | 821 | .extra = 48, |
| 834 | .flags = IDEPCI_FLAG_FORCE_PDC, | 822 | .flags = IDEPCI_FLAG_FORCE_PDC, |
| @@ -840,9 +828,6 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { | |||
| 840 | .init_dma = init_dma_pdc202xx, | 828 | .init_dma = init_dma_pdc202xx, |
| 841 | .channels = 2, | 829 | .channels = 2, |
| 842 | .autodma = AUTODMA, | 830 | .autodma = AUTODMA, |
| 843 | #ifndef CONFIG_PDC202XX_FORCE | ||
| 844 | .enablebits = {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, | ||
| 845 | #endif | ||
| 846 | .bootable = OFF_BOARD, | 831 | .bootable = OFF_BOARD, |
| 847 | .extra = 48, | 832 | .extra = 48, |
| 848 | } | 833 | } |