From ad0ae8dc8ffa884e357e5bf55c4808e24848559e Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Tue, 30 Jan 2007 18:26:01 -0800 Subject: Remove obsolete alias defines of CONFIG_* settings From: Trent Piepho The out of tree v4l-dvb build system didn't always override the kernel's configuration settings with v4l-dvb's settings correctly. To work around this, makefiles would define some new macro based on the setting of a config variable. e.g. the pwc Makefile would define CONFIG_PWC_DEBUG if CONFIG_USB_PWC_DEBUG (which is defined via Kconfig) was set. The v4l-dvb build system should now always override correctly, and this is no longer necessary. This patch gets ride of these extra defines and just uses the CONFIG_* settings directly. Signed-off-by: Trent Piepho --- linux/drivers/media/video/saa7134/saa7134.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media/video/saa7134/saa7134.h') diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 764bd4e71..42fa1c7b7 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -48,7 +48,7 @@ #include #include #endif -#ifdef HAVE_VIDEO_BUF_DVB +#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) #include #endif @@ -555,7 +555,7 @@ struct saa7134_dev { struct work_struct empress_workqueue; int empress_started; -#ifdef HAVE_VIDEO_BUF_DVB +#if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) /* SAA7134_MPEG_DVB only */ struct videobuf_dvb dvb; int (*original_demod_sleep)(struct dvb_frontend* fe); -- cgit v1.2.3 From 3373fc4cf4a1eb5f99208906aaa15e4c006af5bd Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 6 Feb 2007 22:52:04 -0200 Subject: Convert to generic boolean-values From: Richard Knutsson Signed-off-by: Richard Knutsson Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/saa7134/saa7134.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'linux/drivers/media/video/saa7134/saa7134.h') diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 42fa1c7b7..6ca439741 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -52,12 +52,6 @@ #include #endif -#ifndef TRUE -# define TRUE (1==1) -#endif -#ifndef FALSE -# define FALSE (1==0) -#endif #define UNSET (-1U) /* ----------------------------------------------------------- */ -- cgit v1.2.3