diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
commit | d14b7a419a664cd7c1c585c9e7fffee9e9051d53 (patch) | |
tree | 42a1d5b61b58fa0a75252b082c4c6cef6fa9fd8d /drivers/pci/hotplug/ibmphp_core.c | |
parent | e8ff13b0bf88b5e696323a1eec877783d965b3c6 (diff) | |
parent | a58b3a4aba2fd5c445d9deccc73192bff48b591d (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Trivial updates all over the place as usual."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
Fix typo in include/linux/clk.h .
pci: hotplug: Fix typo in pci
iommu: Fix typo in iommu
video: Fix typo in drivers/video
Documentation: Add newline at end-of-file to files lacking one
arm,unicore32: Remove obsolete "select MISC_DEVICES"
module.c: spelling s/postition/position/g
cpufreq: Fix typo in cpufreq driver
trivial: typo in comment in mksysmap
mach-omap2: Fix typo in debug message and comment
scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
Change email address for Steve Glendinning
Btrfs: fix typo in convert_extent_bit
via: Remove bogus if check
netprio_cgroup.c: fix comment typo
backlight: fix memory leak on obscure error path
Documentation: asus-laptop.txt references an obsolete Kconfig item
Documentation: ManagementStyle: fixed typo
mm/vmscan: cleanup comment error in balance_pgdat
mm: cleanup on the comments of zone_reclaim_stat
...
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_core.c')
-rw-r--r-- | drivers/pci/hotplug/ibmphp_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c index 4fda7e6a86a..01cc054eb0d 100644 --- a/drivers/pci/hotplug/ibmphp_core.c +++ b/drivers/pci/hotplug/ibmphp_core.c | |||
@@ -760,7 +760,7 @@ static u8 bus_structure_fixup(u8 busno) | |||
760 | for (dev->devfn = 0; dev->devfn < 256; dev->devfn += 8) { | 760 | for (dev->devfn = 0; dev->devfn < 256; dev->devfn += 8) { |
761 | if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) && | 761 | if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) && |
762 | (l != 0x0000) && (l != 0xffff)) { | 762 | (l != 0x0000) && (l != 0xffff)) { |
763 | debug("%s - Inside bus_struture_fixup()\n", | 763 | debug("%s - Inside bus_structure_fixup()\n", |
764 | __func__); | 764 | __func__); |
765 | pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL); | 765 | pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL); |
766 | break; | 766 | break; |