Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7691646 authored by Adrian Bunk's avatar Adrian Bunk Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: remove the ide_etrax100 chipset type 



I forgot to remove the ide_etrax100 chipset type when removing the
ETRAX_IDE driver.

Reported-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 5e70b7f3

drivers/ide/ide-probe.c

+2 −3
Original line number Diff line number Diff line
@@ -1333,7 +1333,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif) 
static void ide_init_port(ide_hwif_t *hwif, unsigned int port,

			  const struct ide_port_info *d)

{

	if (d->chipset != ide_etrax100)

	hwif->channel = port;



	if (d->chipset)
@@ -1519,7 +1518,7 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d) 
			continue;

		}



		if (d->chipset != ide_etrax100 && (i & 1) && mate) {

		if ((i & 1) && mate) {

			hwif->mate = mate;

			mate->mate = hwif;

		}

drivers/ide/ide-proc.c

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ static int proc_ide_read_imodel 
	case ide_pmac:		name = "mac-io";	break;

	case ide_au1xxx:	name = "au1xxx";	break;

	case ide_palm3710:      name = "palm3710";      break;

	case ide_etrax100:	name = "etrax100";	break;

	case ide_acorn:		name = "acorn";		break;

	default:		name = "(unknown)";	break;

	}

include/linux/ide.h

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ enum { ide_unknown, ide_generic, ide_pci, 
		ide_qd65xx,	ide_umc8672,	ide_ht6560b,

		ide_rz1000,	ide_trm290,

		ide_cmd646,	ide_cy82c693,	ide_4drives,

		ide_pmac,	ide_etrax100,	ide_acorn,

		ide_pmac,	ide_acorn,

		ide_au1xxx,	ide_palm3710

};