summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Makefile.kernel6
-rw-r--r--v4l/compat.h48
-rwxr-xr-xv4l/scripts/hghead.pl2
-rwxr-xr-xv4l/scripts/make_myconfig.pl2
-rwxr-xr-xv4l/scripts/makelinks.sh8
-rw-r--r--v4l/versions.txt1
6 files changed, 34 insertions, 33 deletions
diff --git a/v4l/Makefile.kernel b/v4l/Makefile.kernel
index b01c17f55..bbcfdc6d3 100644
--- a/v4l/Makefile.kernel
+++ b/v4l/Makefile.kernel
@@ -1,8 +1,8 @@
-# This Makefile is used to build sources that are part of the kernel tree.
+# This Makefile is used to build sources that are part of the kernel tree.
# What we want are the various programs used by the kconfig system. We can't
# just directly call the top-level kernel Makefile, as it doesn't provide
# targets to only build the kconfig system. It provides targets to build
-# the kconfig system *and then configure the kernel*.
+# the kconfig system *and then configure the kernel*.
# What we do is include the top-level kernel Makefile here, to get all the
# variables and rules it defines, and then add our own targets to just build
@@ -32,7 +32,7 @@ v4l-qconf: scripts_basic
# Used by the qconfig target
v4l-gconf: scripts_basic
$(MAKE) $(build)=scripts/kconfig gconf-target=1 scripts/kconfig/gconf
-
+
# Used by the menuconfig target, also needs lxdialog
v4l-mconf: scripts_basic
$(MAKE) $(build)=scripts/kconfig scripts/kconfig/mconf
diff --git a/v4l/compat.h b/v4l/compat.h
index ca0a4b886..ae34380e0 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -88,24 +88,24 @@
static inline unsigned long msecs_to_jiffies(const unsigned int m)
{
#if HZ <= 1000 && !(1000 % HZ)
- return (m + (1000 / HZ) - 1) / (1000 / HZ);
+ return (m + (1000 / HZ) - 1) / (1000 / HZ);
#else
#if HZ > 1000 && !(HZ % 1000)
- return m * (HZ / 1000);
+ return m * (HZ / 1000);
#else
- return (m * HZ + 999) / 1000;
+ return (m * HZ + 999) / 1000;
#endif
#endif
}
static inline unsigned int jiffies_to_msecs(const unsigned long j)
{
#if HZ <= 1000 && !(1000 % HZ)
- return (1000 / HZ) * j;
+ return (1000 / HZ) * j;
#else
#if HZ > 1000 && !(HZ % 1000)
- return (j + (HZ / 1000) - 1)/(HZ / 1000);
+ return (j + (HZ / 1000) - 1)/(HZ / 1000);
#else
- return (j * 1000) / HZ;
+ return (j * 1000) / HZ;
#endif
#endif
}
@@ -135,15 +135,15 @@ static inline unsigned long msleep_interruptible(unsigned int msecs)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
/* some keys from 2.6.x which are not (yet?) in 2.4.x */
# define KEY_PLAY 207
-# define KEY_PRINT 210
+# define KEY_PRINT 210
# define KEY_EMAIL 215
# define KEY_SEARCH 217
-# define KEY_SELECT 0x161
+# define KEY_SELECT 0x161
# define KEY_GOTO 0x162
# define KEY_INFO 0x166
# define KEY_CHANNEL 0x16b
# define KEY_LANGUAGE 0x170
-# define KEY_SUBTITLE 0x172
+# define KEY_SUBTITLE 0x172
# define KEY_ZOOM 0x174
# define KEY_MODE 0x175
# define KEY_TV 0x179
@@ -159,7 +159,7 @@ static inline unsigned long msleep_interruptible(unsigned int msecs)
# define KEY_BLUE 0x191
# define KEY_CHANNELUP 0x192
# define KEY_CHANNELDOWN 0x193
-# define KEY_RESTART 0x198
+# define KEY_RESTART 0x198
# define KEY_SHUFFLE 0x19a
# define KEY_NEXT 0x197
# define KEY_RADIO 0x181
@@ -188,8 +188,8 @@ static inline unsigned long msleep_interruptible(unsigned int msecs)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
#define container_of(ptr, type, member) ({ \
- const typeof( ((type *)0)->member ) *__mptr = (ptr); \
- (type *)( (char *)__mptr - offsetof(type,member) );})
+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
+ (type *)( (char *)__mptr - offsetof(type,member) );})
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
@@ -207,12 +207,12 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr)
do { \
DEFINE_WAIT(__wait); \
for (;;) { \
- prepare_to_wait(&wq, &__wait, TASK_UNINTERRUPTIBLE); \
- if (condition) \
- break; \
- __ret = schedule_timeout(__ret); \
- if (!__ret) \
- break; \
+ prepare_to_wait(&wq, &__wait, TASK_UNINTERRUPTIBLE); \
+ if (condition) \
+ break; \
+ __ret = schedule_timeout(__ret); \
+ if (!__ret) \
+ break; \
} \
finish_wait(&wq, &__wait); \
} while (0); \
@@ -231,9 +231,9 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr)
void * __ret = NULL; \
__ret = kmalloc(n * size, flags); \
if (__ret) \
- memset(__ret, 0, n * size); \
+ memset(__ret, 0, n * size); \
__ret; \
-})
+})
#endif
#endif
@@ -241,10 +241,10 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr)
#ifndef kzalloc
#define kzalloc(size, flags) \
({ \
- void *__ret = kmalloc(size, flags); \
- if (__ret) \
- memset(__ret, 0, size); \
- __ret; \
+ void *__ret = kmalloc(size, flags); \
+ if (__ret) \
+ memset(__ret, 0, size); \
+ __ret; \
})
#endif
#endif
diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl
index 3f8b4b0ba..fdc9720c6 100755
--- a/v4l/scripts/hghead.pl
+++ b/v4l/scripts/hghead.pl
@@ -110,7 +110,7 @@ while ($line = <IN>) {
next;
}
-
+
if ($line =~ m/^Acked-by:.*/) {
$signed="$signed$line";
next;
diff --git a/v4l/scripts/make_myconfig.pl b/v4l/scripts/make_myconfig.pl
index 7323f419c..0bde6f6c0 100755
--- a/v4l/scripts/make_myconfig.pl
+++ b/v4l/scripts/make_myconfig.pl
@@ -15,7 +15,7 @@ open IN,".config";
while (<IN>) {
if (m/\s*(\w+)=\s*(\S*)/) {
#printf "%s=%s\n",$1,$2;
- $config { $1 } = $2;
+ $config { $1 } = $2;
}
}
close IN;
diff --git a/v4l/scripts/makelinks.sh b/v4l/scripts/makelinks.sh
index 03fd48849..187145822 100755
--- a/v4l/scripts/makelinks.sh
+++ b/v4l/scripts/makelinks.sh
@@ -5,7 +5,7 @@ if test -z $1 || ! test -d $1 ; then
echo
echo " usage: $0 <path_to_kernel_to_patch>"
echo
- exit
+ exit
fi
echo "patching $1..."
@@ -14,15 +14,15 @@ cd linux
PWD=`pwd`
for x in `find drivers -type d | grep -v CVS` ; do
- mkdir -p -v $1/$x
+ mkdir -p -v $1/$x
done
for x in `find Documentation -type d | grep -v CVS` ; do
- mkdir -p -v $1/$x
+ mkdir -p -v $1/$x
done
for x in `find include -type d | grep -v CVS` ; do
- mkdir -p -v $1/$x
+ mkdir -p -v $1/$x
done
for x in `find Documentation -type f | grep -v CVS | grep -v .cvsignore` ; do
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 2c74da43f..0d7c9e5dc 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -198,6 +198,7 @@ DVB_BCM3510
DVB_LGDT330X
DVB_LNBP21
DVB_ISL6421
+DVB_TUNER_MT2060
VIDEO_SAA7146
VIDEO_SAA7146_VV
VIDEO_VIDEOBUF
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-08 10:51:21 +0000