From 1f97a072e17f6d1c1b4c2790cfc96e7b46743868 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 18 Aug 2008 21:40:04 +0200 Subject: [PATCH] --- yaml --- r: 108747 b: refs/heads/master c: 1b427a33b06ae76c64c1ad9af899a45b682ba6c6 h: refs/heads/master i: 108745: a9fec1fe8bf3c14f3d403d9386aade5e8d23d22a 108743: 99fc87b4bc42bb20dd5da3b9076ef296a48180fc v: v3 --- [refs] | 2 +- trunk/drivers/ide/pci/sgiioc4.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cff0e9866329..0778432a2ced 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc99856a45cab8040f07d93d52fabd11834bf544 +refs/heads/master: 1b427a33b06ae76c64c1ad9af899a45b682ba6c6 diff --git a/trunk/drivers/ide/pci/sgiioc4.c b/trunk/drivers/ide/pci/sgiioc4.c index 42eef19a18f1..681306c9d79b 100644 --- a/trunk/drivers/ide/pci/sgiioc4.c +++ b/trunk/drivers/ide/pci/sgiioc4.c @@ -621,9 +621,9 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) if (!request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE, DRV_NAME)) { printk(KERN_ERR - "%s : %s -- ERROR, Addresses " + "%s %s: -- ERROR, Addresses " "0x%p to 0x%p ALREADY in use\n", - __func__, DRV_NAME, (void *) cmd_phys_base, + DRV_NAME, pci_name(dev), (void *)cmd_phys_base, (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE); return -ENOMEM; }