[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
[sfrench/cifs-2.6.git] / arch / arm / mach-versatile / pci.c
index ba58223f12be8243a3f94e8d241fa1314b65b931..4335c07b86524ef54414c0a9fc038fcb4c474276 100644 (file)
@@ -22,7 +22,7 @@
 #include <linux/spinlock.h>
 #include <linux/init.h>
 
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
@@ -117,7 +117,10 @@ static int versatile_read_config(struct pci_bus *bus, unsigned int devfn, int wh
        } else {
                switch (size) {
                case 1:
-                       v = __raw_readb(addr);
+                       v = __raw_readl(addr);
+                       if (where & 2) v >>= 16;
+                       if (where & 1) v >>= 8;
+                       v &= 0xff;
                        break;
 
                case 2: