[package] firewall: make sure that -m mac is used with --mac-source, follow up to...

[openwrt.git] / target / linux / adm5120 / files / arch / mips / pci / pci-adm5120.c

diff --git a/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c b/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
index bde3e32..86657ce 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
+++ b/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
@@ -21,12 +21,12 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/io.h>

+#include <linux/delay.h>

 
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/pci_regs.h>
 
 
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/pci_regs.h>
 

-#include <asm/delay.h>

 #include <asm/bootinfo.h>
 
 #include <asm/mach-adm5120/adm5120_defs.h>
 #include <asm/bootinfo.h>
 
 #include <asm/mach-adm5120/adm5120_defs.h>


@@ -71,8 +71,8 @@ static inline u32 read_cfgdata(void)
 
 static inline u32 mkaddr(struct pci_bus *bus, unsigned int devfn, int where)
 {
 
 static inline u32 mkaddr(struct pci_bus *bus, unsigned int devfn, int where)
 {

-       return (((bus->number & 0xFF) << 16) | ((devfn & 0xFF) << 8) | \
-               (where & 0xFC));
+       return ((bus->number & 0xFF) << 16) | ((devfn & 0xFF) << 8) | \
+               (where & 0xFC);

 }
 
 /* -------------------------------------------------------------------------*/
 }
 
 /* -------------------------------------------------------------------------*/


@@ -201,7 +201,7 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
                goto out;
        }
 
                goto out;
        }
 

-       if (slot < 1 || slot > 3) {
+       if (slot < 1 || slot > 4) {

                printk(KERN_ALERT "PCI: slot number %u is not supported\n",
                        slot);
                goto out;
                printk(KERN_ALERT "PCI: slot number %u is not supported\n",
                        slot);
                goto out;