diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-22 09:50:50 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-22 09:50:50 -0200 |
commit | 88397975bb4eefaf1654cdb449ae02977262dae5 (patch) | |
tree | 25d4229d3557f9072fb0438c3b96fc208e47e733 /v4l | |
parent | 53de899b707730eb70b95b5a90cd1519a795c88a (diff) | |
parent | ad8467d60299b1d9be5553f7de6bfc5ecfac72c7 (diff) | |
download | mediapointer-dvb-s2-88397975bb4eefaf1654cdb449ae02977262dae5.tar.gz mediapointer-dvb-s2-88397975bb4eefaf1654cdb449ae02977262dae5.tar.bz2 |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l')
-rw-r--r-- | v4l/compat.h | 2 | ||||
-rwxr-xr-x | v4l/scripts/make_makefile.pl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index 98f57879b..253b3387a 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -324,7 +324,7 @@ usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd) /* * uninitialized_var() macro */ -#define uninitialized_var(x) x +#define uninitialized_var(x) x = x #endif #endif diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl index ce6f00516..43c563d47 100755 --- a/v4l/scripts/make_makefile.pl +++ b/v4l/scripts/make_makefile.pl @@ -166,10 +166,10 @@ sub removeubuntu() my $filelist; while ( my ($dir, $files) = each(%instdir) ) { - $filelist .= join(' ', keys %$files); + $filelist .= ' '. join(' ', keys %$files); } while ( my ($dir, $files) = each(%obsolete) ) { - $filelist .= join(' ', keys %$files); + $filelist .= ' ' . join(' ', keys %$files); } $filelist =~ s/\s+$//; |