diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 11:59:40 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 11:59:40 -0500 |
| commit | 13a84687092f47a6d67b1b17940eb3127ae888b3 (patch) | |
| tree | 6d6766e6f7721729f60dd4f72fd93c19f97f2248 /drivers/pci/pci-stub.c | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
| parent | 6e965e0d0e1d102c261326b06338d3385ea55f97 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI/PM: Add comments for PME poll support for PCIe
PCI: Add PLX PCI 9050 workaround for some Meilhaus DAQ cards
PCI: Add workaround for PLX PCI 9050 BAR alignment erratum
PCI: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
x86/PCI: Ignore _SEG on HP xw9300
PCI: Don't touch card regs after runtime suspend D3
Diffstat (limited to 'drivers/pci/pci-stub.c')
| -rw-r--r-- | drivers/pci/pci-stub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-stub.c b/drivers/pci/pci-stub.c index 775e933c2225..6e47c519c510 100644 --- a/drivers/pci/pci-stub.c +++ b/drivers/pci/pci-stub.c | |||
| @@ -28,7 +28,7 @@ MODULE_PARM_DESC(ids, "Initial PCI IDs to add to the stub driver, format is " | |||
| 28 | 28 | ||
| 29 | static int pci_stub_probe(struct pci_dev *dev, const struct pci_device_id *id) | 29 | static int pci_stub_probe(struct pci_dev *dev, const struct pci_device_id *id) |
| 30 | { | 30 | { |
| 31 | dev_printk(KERN_INFO, &dev->dev, "claimed by stub\n"); | 31 | dev_info(&dev->dev, "claimed by stub\n"); |
| 32 | return 0; | 32 | return 0; |
| 33 | } | 33 | } |
| 34 | 34 | ||
