summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--v4l/ChangeLog13
-rw-r--r--v4l/scripts/buildpatch11
2 files changed, 18 insertions, 6 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 71de4044c..0609c1e20 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,4 +1,11 @@
-2005-08-19 20:37
+2005-08-20 05:39 mkrufky
+
+ * scripts/buildpatch:
+ - evaluate #ifdef MM_KERNEL based on existance of $LINUX . "/.mm"
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
+2005-08-19 20:37 mchehab
* tuner.h:
- changed tuner_info from dev_printk to i2c_client info.
@@ -7,7 +14,7 @@
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-2005-08-19 15:48 mkrufky
+2005-08-19 15:48 mkrufky
* cx88-dvb.c:
* scripts/merge-trees.sh, scripts/unmerge-trees.sh:
@@ -15,7 +22,7 @@
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
-2005-08-18 00:00 catalin
+2005-08-18 00:00 catalin
* cx88-blackbird.c:
- fix mpeg packet size & count
diff --git a/v4l/scripts/buildpatch b/v4l/scripts/buildpatch
index 319c46cf0..beeba862a 100644
--- a/v4l/scripts/buildpatch
+++ b/v4l/scripts/buildpatch
@@ -48,7 +48,13 @@ sub kernel_version() {
sub filter_source ($$) {
my ($in,$out) = @_;
- my ($line,$if,$state);
+ my ($line,$if,$state,$mmkernel);
+
+ if (-e $LINUX . "/.mm") {
+ $mmkernel = 1;
+ } else {
+ $mmkernel = 0;
+ }
open IN, "<$in";
open OUT, ">$out";
@@ -64,9 +70,8 @@ sub filter_source ($$) {
}
if ($line =~ /^#ifdef MM_KERNEL/) {
chomp($line);
- $line =~ s@^#if\s*@@;
$state = "if";
- $if = eval $line;
+ $if = $mmkernel;
print OUT "/* BP #if $if ($line) */\n" if $DEBUG;
next;
}