diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 19:23:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 19:23:49 -0800 |
| commit | 017f51788ffdc16b0168143e38ea2c1f3551d983 (patch) | |
| tree | 5ec33c9b638c4e86a1dcafd6528e8f6482549483 /drivers/ide/ide-acpi.c | |
| parent | 17294ab2ca8e8c46f2e4825c55541b2b88e52bf4 (diff) | |
| parent | d224b6269e4731a82f648bb0281ea1a4d8b3311d (diff) | |
| download | linux-017f51788ffdc16b0168143e38ea2c1f3551d983.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
icside: fix PCB version 6 support (v2)
tx4939ide: typo fix and minor cleanup
ide: add CS5536 host driver (v3)
ide: Force VIA IDE legacy interrupts for AmigaOne boards
IDE: Unregister and disable devices if initialization fails.
ide: fix ide_register_port() failure handling
ide: struct device - replace bus_id with dev_name(), dev_set_name()
ide-cd: fix DMA for non bio-backed requests
Diffstat (limited to 'drivers/ide/ide-acpi.c')
| -rw-r--r-- | drivers/ide/ide-acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index d8f295bdad76..ec7d07fa570a 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c @@ -282,7 +282,7 @@ static int do_drive_get_GTF(ide_drive_t *drive, port = hwif->channel ? drive->dn - 2: drive->dn; DEBPRINT("ENTER: %s at %s, port#: %d, hard_port#: %d\n", - hwif->name, dev->bus_id, port, hwif->channel); + hwif->name, dev_name(dev), port, hwif->channel); if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) { DEBPRINT("%s drive %d:%d not present\n", |