Attachment #29845 for bug #48729

Lines 132-137 static struct pci_device_id generic_pci_ Link Here

(-)linux-2.6.6-rc2/drivers/ide/pci/generic.c (+3 lines)
132	{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7},	132	{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7},
133	{ PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8},	133	{ PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8},
134	{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237_SATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9},	134	{ PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237_SATA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9},
		135	{ PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10},
		136	{ PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11},
		137	{ PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12},
135	{ 0, },	138	{ 0, },
136	};	139	};
137	MODULE_DEVICE_TABLE(pci, generic_pci_tbl);	140	MODULE_DEVICE_TABLE(pci, generic_pci_tbl);




		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
		.bootable	= OFF_BOARD,
		.extra		= 0,
	},{ /* 10 */
		.vendor		= PCI_VENDOR_ID_TOSHIBA,
		.device		= PCI_DEVICE_ID_TOSHIBA_PICCOLO,
		.name 		= "Piccolo0102",
		.init_chipset	= init_chipset_generic,
		.init_iops	= NULL,
		.init_hwif	= init_hwif_generic,
		.channels	= 2,
		.autodma	= NOAUTODMA,
		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
		.bootable	= ON_BOARD,
		.extra		= 0,
	},{ /* 11 */
		.vendor		= PCI_VENDOR_ID_TOSHIBA,
		.device		= PCI_DEVICE_ID_TOSHIBA_PICCOLO_1,
		.name 		= "Piccolo0103",
		.init_chipset	= init_chipset_generic,
		.init_iops	= NULL,
		.init_hwif	= init_hwif_generic,
		.channels	= 2,
		.autodma	= NOAUTODMA,
		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
		.bootable	= ON_BOARD,
		.extra		= 0,
	},{ /* 12 */
		.vendor		= PCI_VENDOR_ID_TOSHIBA,
		.device		= PCI_DEVICE_ID_TOSHIBA_PICCOLO_2,
		.name 		= "Piccolo0105",
		.init_chipset	= init_chipset_generic,
		.init_iops	= NULL,
		.init_hwif	= init_hwif_generic,
		.channels	= 2,
		.autodma	= NOAUTODMA,
		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
		.bootable	= ON_BOARD,
		.extra		= 0,
	},{
		.vendor		= 0,
		.device		= 0,

Lines 1383-1388 Link Here

(-)linux-2.6.6-rc2/include/linux/pci_ids.h (+3 lines)
1383	#define PCI_DEVICE_ID_SBE_WANXL400 0x0104	1383	#define PCI_DEVICE_ID_SBE_WANXL400 0x0104
1384		1384
1385	#define PCI_VENDOR_ID_TOSHIBA 0x1179	1385	#define PCI_VENDOR_ID_TOSHIBA 0x1179
		1386	#define PCI_DEVICE_ID_TOSHIBA_PICCOLO 0x0102
		1387	#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0103
		1388	#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0105
1386	#define PCI_DEVICE_ID_TOSHIBA_601 0x0601	1389	#define PCI_DEVICE_ID_TOSHIBA_601 0x0601
1387	#define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a	1390	#define PCI_DEVICE_ID_TOSHIBA_TOPIC95 0x060a
1388	#define PCI_DEVICE_ID_TOSHIBA_TOPIC95_A 0x0603	1391	#define PCI_DEVICE_ID_TOSHIBA_TOPIC95_A 0x0603

Return to bug 48729

Lines 129-134 static ide_pci_device_t generic_chipsets Link Here

(-)linux-2.6.6-rc2/drivers/ide/pci/generic.h (+36 lines)
129	.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},	129	.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
130	.bootable = OFF_BOARD,	130	.bootable = OFF_BOARD,
131	.extra = 0,	131	.extra = 0,
		132	},{ /* 10 */
		133	.vendor = PCI_VENDOR_ID_TOSHIBA,
		134	.device = PCI_DEVICE_ID_TOSHIBA_PICCOLO,
		135	.name = "Piccolo0102",
		136	.init_chipset = init_chipset_generic,
		137	.init_iops = NULL,
		138	.init_hwif = init_hwif_generic,
		139	.channels = 2,
		140	.autodma = NOAUTODMA,
		141	.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
		142	.bootable = ON_BOARD,
		143	.extra = 0,
		144	},{ /* 11 */
		145	.vendor = PCI_VENDOR_ID_TOSHIBA,
		146	.device = PCI_DEVICE_ID_TOSHIBA_PICCOLO_1,
		147	.name = "Piccolo0103",
		148	.init_chipset = init_chipset_generic,
		149	.init_iops = NULL,
		150	.init_hwif = init_hwif_generic,
		151	.channels = 2,
		152	.autodma = NOAUTODMA,
		153	.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
		154	.bootable = ON_BOARD,
		155	.extra = 0,
		156	},{ /* 12 */
		157	.vendor = PCI_VENDOR_ID_TOSHIBA,
		158	.device = PCI_DEVICE_ID_TOSHIBA_PICCOLO_2,
		159	.name = "Piccolo0105",
		160	.init_chipset = init_chipset_generic,
		161	.init_iops = NULL,
		162	.init_hwif = init_hwif_generic,
		163	.channels = 2,
		164	.autodma = NOAUTODMA,
		165	.enablebits = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
		166	.bootable = ON_BOARD,
		167	.extra = 0,
132	},{	168	},{
133	.vendor = 0,	169	.vendor = 0,
134	.device = 0,	170	.device = 0,