diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-17 15:43:51 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-17 15:43:51 -0300 |
commit | acbc613601ba93f26adb3ba1d91aabeff718298b (patch) | |
tree | b73b550f4b3c8eeb485d99fd8f729b5c054bcbf6 /linux | |
parent | 86cbc2b425cbc461fa8e02e45f0e55ee57f4bc6a (diff) | |
download | mediapointer-dvb-s2-acbc613601ba93f26adb3ba1d91aabeff718298b.tar.gz mediapointer-dvb-s2-acbc613601ba93f26adb3ba1d91aabeff718298b.tar.bz2 |
Fix compilation for Miropcm20 and Cinergy
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Miropcm compilation were assuming to compile under
linux/drivers/media/video, but this is not true when compiling in-tree.
Also, make allyesconfig were making "y" to an advanced configuration for
Cinergy.
gentree.pl also updated.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
-rw-r--r-- | linux/drivers/media/radio/miropcm20-radio.c | 4 | ||||
-rw-r--r-- | linux/drivers/media/radio/miropcm20-rds-core.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/linux/drivers/media/radio/miropcm20-radio.c b/linux/drivers/media/radio/miropcm20-radio.c index ec8b16e8f..1a625e24c 100644 --- a/linux/drivers/media/radio/miropcm20-radio.c +++ b/linux/drivers/media/radio/miropcm20-radio.c @@ -23,7 +23,11 @@ #include <linux/init.h> #include "compat.h" #include <linux/videodev.h> +#ifdef _COMPAT_H +#include "../sound/oss/aci.h" +#else #include "../../../sound/oss/aci.h" +#endif #include "miropcm20-rds-core.h" static int radio_nr = -1; diff --git a/linux/drivers/media/radio/miropcm20-rds-core.c b/linux/drivers/media/radio/miropcm20-rds-core.c index 3f5aaf5fa..a9972dfc1 100644 --- a/linux/drivers/media/radio/miropcm20-rds-core.c +++ b/linux/drivers/media/radio/miropcm20-rds-core.c @@ -24,7 +24,11 @@ #endif #include <asm/io.h> +#ifdef _COMPAT_H +#include "../sound/oss/aci.h" +#else #include "../../../sound/oss/aci.h" +#endif #include "miropcm20-rds-core.h" #define DEBUG 0 |