From 2913beaada7f96428bce8094ae83ebd03e764841 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 20 Oct 2007 00:32:36 +0200 Subject: [PATCH] --- yaml --- r: 71776 b: refs/heads/master c: bde07e5eab1351109007bf375349f295977e7f53 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/setup-pci.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5add7dd743db..c0783aa46300 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae6855c0d544739c833c42f4529465cc515d9a3e +refs/heads/master: bde07e5eab1351109007bf375349f295977e7f53 diff --git a/trunk/drivers/ide/setup-pci.c b/trunk/drivers/ide/setup-pci.c index 727544c205b9..02d14bf85ab2 100644 --- a/trunk/drivers/ide/setup-pci.c +++ b/trunk/drivers/ide/setup-pci.c @@ -227,8 +227,9 @@ static unsigned long ide_get_or_set_dma_base(const struct ide_port_info *d, ide_ void ide_setup_pci_noise(struct pci_dev *dev, const struct ide_port_info *d) { - printk(KERN_INFO "%s: IDE controller at PCI slot %s\n", - d->name, pci_name(dev)); + printk(KERN_INFO "%s: IDE controller (0x%04x:0x%04x rev 0x%02x) at " + " PCI slot %s\n", d->name, dev->vendor, dev->device, + dev->revision, pci_name(dev)); } EXPORT_SYMBOL_GPL(ide_setup_pci_noise); @@ -497,9 +498,6 @@ static int ide_setup_pci_controller(struct pci_dev *dev, const struct ide_port_i printk(KERN_INFO "%s: device enabled (Linux)\n", d->name); } - if (noisy) - printk(KERN_INFO "%s: chipset revision %d\n", - d->name, dev->revision); out: return ret; }