diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-18 17:02:04 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-18 17:02:04 -0700 |
| commit | 94a5f850aead02f02f350d401a43c4bf9a9fbf3a (patch) | |
| tree | 14796e071834fc90e45000de3937c7ea96b054bd /arch/arm/kernel | |
| parent | ec5130ba7907a2ad30a595c7d64fd629c69d3a66 (diff) | |
| parent | 1e2571a78138361f74afeb4c5df859b9536b2d8e (diff) | |
| download | blackbird-op-linux-94a5f850aead02f02f350d401a43c4bf9a9fbf3a.tar.gz blackbird-op-linux-94a5f850aead02f02f350d401a43c4bf9a9fbf3a.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Enable INTx if BIOS left them disabled
ia64/PCI: Set IORESOURCE_ROM_SHADOW only for the default VGA device
x86/PCI: Set IORESOURCE_ROM_SHADOW only for the default VGA device
PCI: Update outdated comment for pcibios_bus_report_status()
PCI: Cleanup per-arch list of object files
PCI: cpqphp: Fix hex vs decimal typo in cpqhpc_probe()
x86/PCI: Fix function definition whitespace
x86/PCI: Reword comments
x86/PCI: Remove unnecessary local variable initialization
PCI: Remove unnecessary list_empty(&pci_pme_list) check
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/bios32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 004670e97ca8..d0d46786892c 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -19,7 +19,7 @@ static int debug_pci; /* - * We can't use pci_find_device() here since we are + * We can't use pci_get_device() here since we are * called from interrupt context. */ static void pcibios_bus_report_status(struct pci_bus *bus, u_int status_mask, int warn) |
