diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-30 19:47:02 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-30 19:47:02 +0000 |
| commit | c698da52c95f1058073a0f10b8477a0a86105125 (patch) | |
| tree | 0b5bc92724605b30a3f7ba13e067e55b018e21ef /v4l | |
| parent | cc9ca28525b2125ef6139caf341dca98201d011c (diff) | |
| download | mediapointer-dvb-s2-c698da52c95f1058073a0f10b8477a0a86105125.tar.gz mediapointer-dvb-s2-c698da52c95f1058073a0f10b8477a0a86105125.tar.bz2 | |
* bttv-driver.c, msp3400.c, tda9887.c, tuner-core.c:
* Makefile, scripts/merge-trees.sh, scripts/unmerge-trees.sh:
- Fix cvs compile to work for both latest -linus and -mm trees.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 7 | ||||
| -rw-r--r-- | v4l/Makefile | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 348832b5f..76956280d 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-07-30 19:40 mkrufky + * bttv-driver.c, msp3400.c, tda9887.c, tuner-core.c: + * Makefile, scripts/merge-trees.sh, scripts/unmerge-trees.sh: + - Fix cvs compile to work for both latest -linus and -mm trees. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-07-30 16:17 mkrufky * cx88-dvb.c, scripts/merge-trees.sh, scripts/unmerge-trees.sh: - Fix cvs compile for 2.6.13 diff --git a/v4l/Makefile b/v4l/Makefile index b452c8d0a..93968dbe0 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -96,8 +96,10 @@ endif mm-kernel := $(TOPDIR)/.mm ifneq ($(mm-kernel),) MM_KERNEL_CFLAGS := -DMM_KERNEL=$(shell cat $(mm-kernel) 2> /dev/null) +ifneq ($(MM_KERNEL_CFLAGS),-DMM_KERNEL=) EXTRA_CFLAGS += $(MM_KERNEL_CFLAGS) endif +endif bttv.o: $(bttv-objs) $(LD) -r -o $@ $(bttv-objs) |