From 5e8fe57d32dd88f0f84ff9c19e57d2e586dba9a7 Mon Sep 17 00:00:00 2001
From: Michael Hunold <devnull@localhost>
Date: Tue, 22 Apr 2003 16:30:45 +0000
Subject: =?UTF-8?q?-=20removed=20the=20compatibility=20crap=20around=20KBU?=
 =?UTF-8?q?ILD=5FMODNAME=20from=20all=20drivers,=20=20=20use=20=20KBUILD?=
 =?UTF-8?q?=5FBASENAME=20for=202.4=20instead=20=C2=AD=20some=20changes=20t?=
 =?UTF-8?q?o=20the=20i2c=20core=20to=20make=20it=20work=20with=20both=202.?=
 =?UTF-8?q?4=20and=20late=202.5=20=20=20kernels=20(not=20done=20yet=20--?=
 =?UTF-8?q?=20only=20interesting=20for=20analog=20drivers)=20-=20add=20MOD?=
 =?UTF-8?q?ULE=5FDEVICE=5FTABLE=20to=20all=20drivers,=20so=20that=20pci=20?=
 =?UTF-8?q?"hotplug"=20can=20detect=20=20=20the=20devices=20automatically.?=
 =?UTF-8?q?=20Alan=20Cox=20says,=20that=20we=20should=20use=20this=20to=20?=
 =?UTF-8?q?load=20=20=20the=20firmware=20(not=20done=20yet)=20-=20fix=20th?=
 =?UTF-8?q?e=20long=20standing=20"insmod/rmmod=20with=20multiple=20budget?=
 =?UTF-8?q?=20cards"=20bug=20--=20it=20=20=20was=20a=20double=20kfree()=20?=
 =?UTF-8?q?call...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 linux/include/media/saa7146.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'linux/include/media')

diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h
index ac8544da4..5358ae90d 100644
--- a/linux/include/media/saa7146.h
+++ b/linux/include/media/saa7146.h
@@ -31,7 +31,16 @@ extern unsigned int saa7146_debug;
 	#define DEBUG_VARIABLE saa7146_debug
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
+#define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_BASENAME),__FUNCTION__)
+#define INFO(x) { printk("%s: ",__stringify(KBUILD_BASENAME)); printk x; }
+#else
 #define DEBUG_PROLOG printk("%s: %s(): ",__stringify(KBUILD_MODNAME),__FUNCTION__)
+#define INFO(x) { printk("%s: ",__stringify(KBUILD_MODNAME)); printk x; }
+#endif
+
+#define ERR(x) { DEBUG_PROLOG; printk x; }
+
 #define DEB_S(x)    if (0!=(DEBUG_VARIABLE&0x01)) { DEBUG_PROLOG; printk x; } /* simple debug messages */
 #define DEB_D(x)    if (0!=(DEBUG_VARIABLE&0x02)) { DEBUG_PROLOG; printk x; } /* more detailed debug messages */
 #define DEB_EE(x)   if (0!=(DEBUG_VARIABLE&0x04)) { DEBUG_PROLOG; printk x; } /* print enter and exit of functions */
@@ -40,9 +49,6 @@ extern unsigned int saa7146_debug;
 #define DEB_INT(x)  if (0!=(DEBUG_VARIABLE&0x20)) { DEBUG_PROLOG; printk x; } /* interrupt debug messages */
 #define DEB_CAP(x)  if (0!=(DEBUG_VARIABLE&0x40)) { DEBUG_PROLOG; printk x; } /* capture debug messages */
 
-#define ERR(x) { DEBUG_PROLOG; printk x; }
-#define INFO(x) { printk("%s: ",__stringify(KBUILD_MODNAME)); printk x; }
-
 #define IER_DISABLE(x,y) \
 	saa7146_write(x, IER, saa7146_read(x, IER) & ~(y));
 #define IER_ENABLE(x,y) \
-- 
cgit v1.2.3