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

Commit 3e9e4c86 authored by Alan Cox's avatar Alan Cox Committed by Bartlomiej Zolnierkiewicz
Browse files

ide/generic: Jmicron has its own drivers now 



Drop ide-generic support for Jmicron identifiers as we now trust Jmicron.c for
this with drivers/ide.  The code check remains for the all-generic-ide case.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent e5c073ff

drivers/ide/pci/generic.c

+0 −35
Original line number Diff line number Diff line
@@ -185,36 +185,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { 
		.channels	= 2,

		.autodma	= AUTODMA,

		.bootable	= OFF_BOARD,

	},{	/* 15 */

		.name		= "JMB361",

		.init_hwif	= init_hwif_generic,

		.channels	= 2,

		.autodma	= AUTODMA,

		.bootable	= OFF_BOARD,

	},{	/* 16 */

		.name		= "JMB363",

		.init_hwif	= init_hwif_generic,

		.channels	= 2,

		.autodma	= AUTODMA,

		.bootable	= OFF_BOARD,

	},{	/* 17 */

		.name		= "JMB365",

		.init_hwif	= init_hwif_generic,

		.channels	= 2,

		.autodma	= AUTODMA,

		.bootable	= OFF_BOARD,

	},{	/* 18 */

		.name		= "JMB366",

		.init_hwif	= init_hwif_generic,

		.channels	= 2,

		.autodma	= AUTODMA,

		.bootable	= OFF_BOARD,

	},{	/* 19 */

		.name		= "JMB368",

		.init_hwif	= init_hwif_generic,

		.channels	= 2,

		.autodma	= AUTODMA,

		.bootable	= OFF_BOARD,

	}

};
@@ -281,11 +251,6 @@ static struct pci_device_id generic_pci_tbl[] = { 
	{ PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12},

	{ PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13},

	{ PCI_VENDOR_ID_NETCELL,PCI_DEVICE_ID_REVOLUTION,          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14},

	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15},

	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16},

	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17},

	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18},

	{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368,	   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19},

	/* Must come last. If you add entries adjust this table appropriately and the init_one code */

	{ PCI_ANY_ID,		PCI_ANY_ID,			   PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL, 0},

	{ 0, },