aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-06-10 14:56:36 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-06-10 14:56:36 -0400
commitb76916462d990751882eaeadc75ac8c487d6de1d (patch)
tree2be5caf019b30c56f02ebc00441a875915d7ff46 /drivers/ide/ide-probe.c
parent5e70b7f3c24468bb1635b295945edb48ecd9656a (diff)
ide: remove the ide_etrax100 chipset type
I forgot to remove the ide_etrax100 chipset type when removing the ETRAX_IDE driver. Reported-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 655ec7ef568a..0bccb63d10a1 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1333,8 +1333,7 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
1333static void ide_init_port(ide_hwif_t *hwif, unsigned int port, 1333static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
1334 const struct ide_port_info *d) 1334 const struct ide_port_info *d)
1335{ 1335{
1336 if (d->chipset != ide_etrax100) 1336 hwif->channel = port;
1337 hwif->channel = port;
1338 1337
1339 if (d->chipset) 1338 if (d->chipset)
1340 hwif->chipset = d->chipset; 1339 hwif->chipset = d->chipset;
@@ -1519,7 +1518,7 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d)
1519 continue; 1518 continue;
1520 } 1519 }
1521 1520
1522 if (d->chipset != ide_etrax100 && (i & 1) && mate) { 1521 if ((i & 1) && mate) {
1523 hwif->mate = mate; 1522 hwif->mate = mate;
1524 mate->mate = hwif; 1523 mate->mate = hwif;
1525 } 1524 }