Merge branches 'core/futexes' and 'core/iommu' into core/urgent

[karo-tx-linux.git] / arch / mips / pci / pci-bcm47xx.c

diff --git a/arch/mips/pci/pci-bcm47xx.c b/arch/mips/pci/pci-bcm47xx.c
index bea9b6cdfdbf55ea236c1cda6ffb3e20a5ec7267..455f8e50a0070b6be32c0e2c0cde56af487aafac 100644 (file)
--- a/arch/mips/pci/pci-bcm47xx.c
+++ b/arch/mips/pci/pci-bcm47xx.c
@@ -57,4 +57,3 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
        dev->irq = res;
        return 0;
 }
-