Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

[linux-2.6-omap-h63xx.git] / include / asm-parisc / ropes.h

diff --git a/include/asm-parisc/ropes.h b/include/asm-parisc/ropes.h
index 2e3de0ae04d1ac2c02ada0eff399696e16f503b1..007a880615eb80d766863f8e0b3708750c2ebbef 100644 (file)
--- a/include/asm-parisc/ropes.h
+++ b/include/asm-parisc/ropes.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_PARISC_ROPES_H_
 #define _ASM_PARISC_ROPES_H_
 
+#include <asm-parisc/parisc-device.h>
+
 #ifdef CONFIG_64BIT
 /* "low end" PA8800 machines use ZX1 chipset: PAT PDC and only run 64-bit */
 #define ZX1_SUPPORT
@@ -12,7 +14,7 @@
 #endif
 
 /*
-** The number of pdir entries to "free" before issueing
+** The number of pdir entries to "free" before issuing
 ** a read to PCOM register to flush out PCOM writes.
 ** Interacts with allocation granularity (ie 4 or 8 entries
 ** allocated and free'd/purged at a time might make this
@@ -231,6 +233,16 @@ static inline int IS_QUICKSILVER(struct parisc_device *d) {
        return (d->id.hversion == QUICKSILVER_HVERS);
 }
 
+static inline int agp_mode_mercury(void __iomem *hpa) {
+       u64 bus_mode;
+
+       bus_mode = readl(hpa + 0x0620);
+       if (bus_mode & 1)
+               return 1;
+
+       return 0;
+}
+
 /*
 ** I/O SAPIC init function
 ** Caller knows where an I/O SAPIC is. LBA has an integrated I/O SAPIC.