summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@optimus.localdomain>2006-12-19 18:03:20 +1100
committerDave Airlie <airlied@linux.ie>2006-12-19 18:03:20 +1100
commit303307d25484f3f7179e6967697d28369a73dca9 (patch)
tree554f38d0c488a24a97e9956b0db5cee509a83eea
parent1a3316f667963fca2f9a3bffcbee39cb01bf5f09 (diff)
fix irq args compatiblity with pre 2.6.19
-rw-r--r--linux-core/drm_compat.h6
-rw-r--r--linux-core/drm_os_linux.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index a1a94399..c4e80e91 100644
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -57,6 +57,12 @@
#define module_param(name, type, perm)
#endif
+/* older kernels had different irq args */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+#undef DRM_IRQ_ARGS
+#define DRM_IRQ_ARGS int irq, void *arg, struct pt_regs *regs
+#endif
+
#ifndef list_for_each_safe
#define list_for_each_safe(pos, n, head) \
for (pos = (head)->next, n = pos->next; pos != (head); \
diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h
index 42700978..49ba2fbc 100644
--- a/linux-core/drm_os_linux.h
+++ b/linux-core/drm_os_linux.h
@@ -56,7 +56,7 @@
drm_device_t *dev = priv->head->dev
/** IRQ handler arguments and return type and values */
-#define DRM_IRQ_ARGS int irq, void *arg, struct pt_regs *regs
+#define DRM_IRQ_ARGS int irq, void *arg
/** backwards compatibility with old irq return values */
#ifndef IRQ_HANDLED
typedef void irqreturn_t;