diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 8 | ||||
| -rw-r--r-- | v4l/Makefile | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 4dd2ead07..036511328 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-07-27 04:46 mkrufky + * Makefile: + - Include logic to detect compilation against -mm kernels, + adding MM_KERNEL to EXTRA_CFLAGS. This test will be available + in -mm kernels AFTER (but not including) 2.6.13-rc3-mm1. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-07-27 02:42 mchehab * tuner-core.c: - Add new parameter to help identify radio chipsets: diff --git a/v4l/Makefile b/v4l/Makefile index 3d980c1be..b452c8d0a 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -93,6 +93,12 @@ SNAPSHOT_CFLAGS := -DSNAPSHOT='$(shell cat $(snapshot))' EXTRA_CFLAGS += $(SNAPSHOT_CFLAGS) endif +mm-kernel := $(TOPDIR)/.mm +ifneq ($(mm-kernel),) +MM_KERNEL_CFLAGS := -DMM_KERNEL=$(shell cat $(mm-kernel) 2> /dev/null) +EXTRA_CFLAGS += $(MM_KERNEL_CFLAGS) +endif + bttv.o: $(bttv-objs) $(LD) -r -o $@ $(bttv-objs) |