tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: remove unused variables from drivers/ide/ppc/pmac.c
ide: ST320413A has the same problem as ST340823A

Linus Torvalds d56c5c41 f15f4138

+1 -2
+1
drivers/ide/ide-disk.c
··· 487 487 */ 488 488 static const struct drive_list_entry hpa_list[] = { 489 489 { "ST340823A", NULL }, 490 + { "ST320413A", NULL }, 490 491 { NULL, NULL } 491 492 }; 492 493
-2
drivers/ide/ppc/pmac.c
··· 1802 1802 { 1803 1803 struct hd_driveid *id = drive->id; 1804 1804 ide_hwif_t *hwif = HWIF(drive); 1805 - pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)hwif->hwif_data; 1806 1805 int enable = 1; 1807 - int map; 1808 1806 drive->using_dma = 0; 1809 1807 1810 1808 if (drive->media == ide_floppy)