summaryrefslogtreecommitdiff
path: root/linux-core/drm_os_linux.h
diff options
context:
space:
mode:
authorMichel Daenzer <michel@daenzer.net>2003-07-29 10:11:48 +0000
committerMichel Daenzer <michel@daenzer.net>2003-07-29 10:11:48 +0000
commit4b60cae90e0f689f68167c2e3419df7574cae1ab (patch)
treec6e0714b4e51fc2ea9732ce5e5d57915ff350276 /linux-core/drm_os_linux.h
parentc26ffeafca30332520660d2bef1106b56d0ef5e1 (diff)
IRQ code cleanup suggested by Linus Torvalds
i830 build fix
Diffstat (limited to 'linux-core/drm_os_linux.h')
-rw-r--r--linux-core/drm_os_linux.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h
index 94230dc4..38a5769e 100644
--- a/linux-core/drm_os_linux.h
+++ b/linux-core/drm_os_linux.h
@@ -33,18 +33,14 @@
/** DRM device local declaration */
#define DRM_DEVICE drm_file_t *priv = filp->private_data; \
drm_device_t *dev = priv->dev
-
+
/** IRQ handler arguments and return type and values */
#define DRM_IRQ_ARGS int irq, void *arg, struct pt_regs *regs
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69)
-#define DRM_IRQ_RET void
-#define DRM_IRQ_NONE
-#define DRM_IRQ_HANDLED
-#else
-#define DRM_IRQ_RET irqreturn_t
-#define DRM_IRQ_NONE IRQ_NONE
-#define DRM_IRQ_HANDLED IRQ_HANDLED
+/** backwards compatibility with old irq return values */
+#ifndef IRQ_HANDLED
+typedef void irqreturn_t;
+#define IRQ_HANDLED /* nothing */
+#define IRQ_NONE /* nothing */
#endif
/** AGP types */