Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / include / drm / drm_os_linux.h

diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h
index 013551d03c035c984d19e02b692a0ed5b5c3015f..26641e95e0a4be8cb0ce273c88eb65196bfe02af 100644 (file)
--- a/include/drm/drm_os_linux.h
+++ b/include/drm/drm_os_linux.h
@@ -7,12 +7,12 @@
 #include <linux/delay.h>
 
 #ifndef readq
-static u64 readq(void __iomem *reg)
+static inline u64 readq(void __iomem *reg)
 {
        return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32);
 }
 
-static void writeq(u64 val, void __iomem *reg)
+static inline void writeq(u64 val, void __iomem *reg)
 {
        writel(val & 0xffffffff, reg);
        writel(val >> 32, reg + 0x4UL);