diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-19 11:39:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-19 11:39:10 -0700 |
| commit | d56c5c414c240f51213c11b3656001b5a3d4b499 (patch) | |
| tree | ea4c56bf283921a08decb75ebc79eb245dece4aa /drivers | |
| parent | f15f41383d466860f8b22f669da8c841f8d73c3b (diff) | |
| parent | 588a33556ccf3e2135c7b4527557616f72fc144c (diff) | |
| download | linux-3.10-d56c5c414c240f51213c11b3656001b5a3d4b499.tar.gz linux-3.10-d56c5c414c240f51213c11b3656001b5a3d4b499.tar.bz2 linux-3.10-d56c5c414c240f51213c11b3656001b5a3d4b499.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/ide-disk.c | 1 | ||||
| -rw-r--r-- | drivers/ide/ppc/pmac.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index eba1adbc1b6..4754769eda9 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c @@ -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 } }; diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 4b13cd9a027..f19eb6daeef 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -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) |