From 4b60cae90e0f689f68167c2e3419df7574cae1ab Mon Sep 17 00:00:00 2001
From: Michel Daenzer <michel@daenzer.net>
Date: Tue, 29 Jul 2003 10:11:48 +0000
Subject: IRQ code cleanup suggested by Linus Torvalds i830 build fix

---
 linux/drm_os_linux.h | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'linux/drm_os_linux.h')

diff --git a/linux/drm_os_linux.h b/linux/drm_os_linux.h
index 94230dc4..38a5769e 100644
--- a/linux/drm_os_linux.h
+++ b/linux/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 */
-- 
cgit v1.2.3