mac80211: update to 2010-06-10, add pending work with stability and throughput fixes...

[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 b0caef2..bde3e32 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
+++ b/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
@@ -1,10 +1,7 @@
 /*
 /*

- *  $Id$
- *

  *  ADM5120 PCI Host Controller driver
  *
  *  ADM5120 PCI Host Controller driver
  *

- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>

  *
  *  This code was based on the ADM5120 specific port of the Linux 2.6.10 kernel
  *  done by Jeroen Vreeken
  *
  *  This code was based on the ADM5120 specific port of the Linux 2.6.10 kernel
  *  done by Jeroen Vreeken


@@ -32,10 +29,10 @@
 #include <asm/delay.h>
 #include <asm/bootinfo.h>
 
 #include <asm/delay.h>
 #include <asm/bootinfo.h>
 

-#include <adm5120_defs.h>
-#include <adm5120_info.h>
-#include <adm5120_defs.h>
-#include <adm5120_platform.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_info.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_platform.h>

 
 #undef DEBUG
 
 
 #undef DEBUG
 


@@ -260,14 +257,10 @@ static struct pci_controller adm5120_controller = {
 
 static int __init adm5120_pci_setup(void)
 {
 
 static int __init adm5120_pci_setup(void)
 {

-       int pci_bios;
-
-       pci_bios = adm5120_has_pci();
-
-       printk(KERN_INFO "adm5120: system has %sPCI BIOS\n",
-               pci_bios ? "" : "no ");
-       if (pci_bios == 0)
+       if (adm5120_package_pqfp()) {
+               printk(KERN_INFO "PCI: not available on ADM5120P\n");

                return -1;
                return -1;

+       }

 
        /* Avoid ISA compat ranges.  */
        PCIBIOS_MIN_IO = 0x00000000;
 
        /* Avoid ISA compat ranges.  */
        PCIBIOS_MIN_IO = 0x00000000;