Merge commit 'v2.6.39-rc6' into x86/cleanups

[pandora-kernel.git] / arch / microblaze / pci / indirect_pci.c

diff --git a/arch/microblaze/pci/indirect_pci.c b/arch/microblaze/pci/indirect_pci.c
index 25f18f0..4196eb6 100644 (file)
--- a/arch/microblaze/pci/indirect_pci.c
+++ b/arch/microblaze/pci/indirect_pci.c
@@ -108,7 +108,7 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
                out_le32(hose->cfg_addr, (0x80000000 | (bus_no << 16) |
                         (devfn << 8) | reg | cfg_type));
 
-       /* surpress setting of PCI_PRIMARY_BUS */
+       /* suppress setting of PCI_PRIMARY_BUS */
        if (hose->indirect_type & INDIRECT_TYPE_SURPRESS_PRIMARY_BUS)
                if ((offset == PCI_PRIMARY_BUS) &&
                        (bus->number == hose->first_busno))