From 5845d0064bf41203f3deefaf21b77da167736f6c Mon Sep 17 00:00:00 2001 From: Johannes Stezenbach Date: Fri, 20 Dec 2002 13:46:30 +0000 Subject: 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 --- linux/drivers/media/common/saa7146.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'linux') 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) -- cgit v1.2.3