diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-05-14 17:06:16 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-05-14 17:06:16 -0400 |
commit | e7f379d5cabb2790ecce5d623382fa6085e7686d (patch) | |
tree | c38b2d36fd35f27db369e1091b39e7d47e37db3b /drivers/ide/pci/alim15x3.c | |
parent | 63b1623ef0e33160d782fd1b0044e9a8af5d16cf (diff) |
alim15x3: remove WDC_ALI15X3 config option
There is "wdc_udma" module parameter now.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/alim15x3.c')
-rw-r--r-- | drivers/ide/pci/alim15x3.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 3eaab542c41a..f2129d5e07f2 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -127,8 +127,6 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
127 | * No UDMA on revisions <= 0x20 | 127 | * No UDMA on revisions <= 0x20 |
128 | * Disk only for revisions < 0xC2 | 128 | * Disk only for revisions < 0xC2 |
129 | * Not WDC drives on M1543C-E (?) | 129 | * Not WDC drives on M1543C-E (?) |
130 | * | ||
131 | * FIXME: WDC ifdef needs to die | ||
132 | */ | 130 | */ |
133 | 131 | ||
134 | static u8 ali_udma_filter(ide_drive_t *drive) | 132 | static u8 ali_udma_filter(ide_drive_t *drive) |
@@ -136,11 +134,9 @@ static u8 ali_udma_filter(ide_drive_t *drive) | |||
136 | if (m5229_revision > 0x20 && m5229_revision < 0xC2) { | 134 | if (m5229_revision > 0x20 && m5229_revision < 0xC2) { |
137 | if (drive->media != ide_disk) | 135 | if (drive->media != ide_disk) |
138 | return 0; | 136 | return 0; |
139 | #ifndef CONFIG_WDC_ALI15X3 | ||
140 | if (chip_is_1543c_e && strstr(drive->id->model, "WDC ") && | 137 | if (chip_is_1543c_e && strstr(drive->id->model, "WDC ") && |
141 | wdc_udma == 0) | 138 | wdc_udma == 0) |
142 | return 0; | 139 | return 0; |
143 | #endif | ||
144 | } | 140 | } |
145 | 141 | ||
146 | return drive->hwif->ultra_mask; | 142 | return drive->hwif->ultra_mask; |