Commit d56c5c41 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f15f4138 588a3355

drivers/ide/ide-disk.c

+1 −0
Original line number Diff line number Diff line
@@ -487,6 +487,7 @@ static inline int idedisk_supports_lba48(const struct hd_driveid *id) 
 */

static const struct drive_list_entry hpa_list[] = {

	{ "ST340823A",	NULL },

	{ "ST320413A",	NULL },

	{ NULL,		NULL }

};

drivers/ide/ppc/pmac.c

+0 −2
Original line number Diff line number Diff line
@@ -1802,9 +1802,7 @@ pmac_ide_dma_check(ide_drive_t *drive) 
{

	struct hd_driveid *id = drive->id;

	ide_hwif_t *hwif = HWIF(drive);

	pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)hwif->hwif_data;

	int enable = 1;

	int map;

	drive->using_dma = 0;

	

	if (drive->media == ide_floppy)