summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorJohannes Stezenbach <devnull@localhost>2002-12-20 13:46:30 +0000
committerJohannes Stezenbach <devnull@localhost>2002-12-20 13:46:30 +0000
commit5845d0064bf41203f3deefaf21b77da167736f6c (patch)
treea51f2e973c0e06dd1f5ed3fa5f117eaf6042316e /linux
parent3a7cafe5fd7bda042d943ae51899f9ca2cbeedc4 (diff)
downloadmediapointer-dvb-s2-5845d0064bf41203f3deefaf21b77da167736f6c.tar.gz
mediapointer-dvb-s2-5845d0064bf41203f3deefaf21b77da167736f6c.tar.bz2
cure for:
saa7146.h:34: warning: `BUG_ON' redefined /usr/src/linux-2.4.20/include/linux/kernel.h:197: warning: this is the location of the previous definition
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/common/saa7146.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/common/saa7146.h b/linux/drivers/media/common/saa7146.h
index 090281eb5..5c6455c6d 100644
--- a/linux/drivers/media/common/saa7146.h
+++ b/linux/drivers/media/common/saa7146.h
@@ -31,8 +31,10 @@ from flaws in video-buf.c => Gerd Knorr */
#define saa7146_read(sxy,adr) readl(sxy->mem+(adr))
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
#define BUG_ON(condition) do { if ((condition)!=0) BUG(); } while(0)
#endif
+#endif
#define BOARD_CAN_DO_VBI(dev) (dev->revision != 0 && 0 != dev->ext->vbi)