diff options
| author | Michael Hunold <devnull@localhost> | 2002-12-17 15:29:41 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2002-12-17 15:29:41 +0000 |
| commit | 7b024f3ee0340a819eb279c71367d2b2af44bbbc (patch) | |
| tree | 502c5d0497ce4324b7604542202a01822326e50f /linux | |
| parent | 323dee0dd2b07f636e703605664b2f92d93c403b (diff) | |
| download | mediapointer-dvb-s2-7b024f3ee0340a819eb279c71367d2b2af44bbbc.tar.gz mediapointer-dvb-s2-7b024f3ee0340a819eb279c71367d2b2af44bbbc.tar.bz2 | |
Some build fixes. Removed "makecrosslinks" because it won't work
anymore.
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/common/saa7146.h | 5 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/Makefile | 3 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/Makefile | 3 |
4 files changed, 3 insertions, 10 deletions
diff --git a/linux/drivers/media/common/saa7146.h b/linux/drivers/media/common/saa7146.h index 27889ec19..752a10d2d 100644 --- a/linux/drivers/media/common/saa7146.h +++ b/linux/drivers/media/common/saa7146.h @@ -32,8 +32,7 @@ #define BOARD_CAN_DO_VBI(dev) (dev->revision != 0 && 0 != dev->ext->vbi) extern int debug; -// #define DEBUG_PROLOG printk("(0x%08x): %s: %s(): ",dev == 0 ? 0 : (dev->mem == 0?0:saa7146_read(dev,IER)),KBUILD_MODNAME,__FUNCTION__) -#define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME,__FUNCTION__) +#define DEBUG_PROLOG printk("%s: %s(): ","KBUILD_MODNAME",__FUNCTION__) #define DEB_S(x) if (0!=(debug&0x01)) { DEBUG_PROLOG; printk x; } /* simple debug messages */ #define DEB_D(x) if (0!=(debug&0x02)) { DEBUG_PROLOG; printk x; } /* more detailed debug messages */ @@ -44,7 +43,7 @@ extern int debug; #define DEB_CAP(x) if (0!=(debug&0x40)) { DEBUG_PROLOG; printk x; } /* capture debug messages */ #define ERR(x) { DEBUG_PROLOG; printk x; } -#define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; } +#define INFO(x) { printk("%s: ","KBUILD_MODNAME"); printk x; } #define IER_DISABLE(x,y) \ saa7146_write(x, IER, saa7146_read(x, IER) & ~(y)); diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index 3c4717755..82b018be2 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -23,7 +23,7 @@ #include "saa7146.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) - #define KBUILD_MODNAME "saa7146" + #define KBUILD_MODNAME saa7146 #endif /* global variables */ diff --git a/linux/drivers/media/dvb/Makefile b/linux/drivers/media/dvb/Makefile index dfd6ced04..3290afb80 100644 --- a/linux/drivers/media/dvb/Makefile +++ b/linux/drivers/media/dvb/Makefile @@ -3,6 +3,3 @@ # obj-y := dvb-core/ frontends/ av7110/ - -include $(TOPDIR)/Rules.make - diff --git a/linux/drivers/media/dvb/frontends/Makefile b/linux/drivers/media/dvb/frontends/Makefile index ec34c902b..9e9a35a00 100644 --- a/linux/drivers/media/dvb/frontends/Makefile +++ b/linux/drivers/media/dvb/frontends/Makefile @@ -12,6 +12,3 @@ obj-$(CONFIG_DVB_ATMEL_AT76C651) += at76c651.o obj-$(CONFIG_DVB_GRUNDIG_29504_491) += grundig_29504-491.o obj-$(CONFIG_DVB_GRUNDIG_29504_401) += grundig_29504-401.o obj-$(CONFIG_DVB_VES1820) += ves1820.o - -include $(TOPDIR)/Rules.make - |