summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/Documentation/video4linux/bttv/Insmod-options2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_frontend.c2
-rw-r--r--linux/drivers/media/dvb/frontends/dib3000mb.c2
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-audio.c2
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c2
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-std.c4
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c2
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c2
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c2
-rw-r--r--linux/sound/oss/btaudio.c2
-rwxr-xr-xv4l/scripts/gentree.pl40
11 files changed, 45 insertions, 17 deletions
diff --git a/linux/Documentation/video4linux/bttv/Insmod-options b/linux/Documentation/video4linux/bttv/Insmod-options
index bb7c2cac7..5ef75787f 100644
--- a/linux/Documentation/video4linux/bttv/Insmod-options
+++ b/linux/Documentation/video4linux/bttv/Insmod-options
@@ -57,7 +57,7 @@ bttv.o
i2c_udelay= Allow reduce I2C speed. Default is 5 usecs
(meaning 66,67 Kbps). The default is the
maximum supported speed by kernel bitbang
- algoritm. You may use lower numbers, if I2C
+ algorithm. You may use lower numbers, if I2C
messages are lost (16 is known to work on
all supported cards).
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index 319dccf5f..60c8b0da2 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -899,7 +899,7 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
fetunesettings.parameters.inversion = INVERSION_AUTO;
}
if (fe->ops.info.type == FE_OFDM) {
- /* without hierachical coding code_rate_LP is irrelevant,
+ /* without hierarchical coding code_rate_LP is irrelevant,
* so we tolerate the otherwise invalid FEC_NONE setting */
if (fepriv->parameters.u.ofdm.hierarchy_information == HIERARCHY_NONE &&
fepriv->parameters.u.ofdm.code_rate_LP == FEC_NONE)
diff --git a/linux/drivers/media/dvb/frontends/dib3000mb.c b/linux/drivers/media/dvb/frontends/dib3000mb.c
index adbabfdb0..b6adea5ff 100644
--- a/linux/drivers/media/dvb/frontends/dib3000mb.c
+++ b/linux/drivers/media/dvb/frontends/dib3000mb.c
@@ -239,7 +239,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,
default:
return -EINVAL;
}
- deb_setf("hierachy: ");
+ deb_setf("hierarchy: ");
switch (ofdm->hierarchy_information) {
case HIERARCHY_NONE:
deb_setf("none ");
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
index 7fcc6cffa..3ed700041 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -130,7 +130,7 @@ static unsigned int pvr2_msp3400_describe(struct pvr2_msp3400_handler *ctxt,
}
-const static struct pvr2_i2c_handler_functions msp3400_funcs = {
+static const struct pvr2_i2c_handler_functions msp3400_funcs = {
.detach = (void (*)(void *))pvr2_msp3400_detach,
.check = (int (*)(void *))msp3400_check,
.update = (void (*)(void *))msp3400_update,
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
index 71cc14280..c7041921a 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -213,7 +213,7 @@ static void decoder_reset(struct pvr2_v4l_cx2584x *ctxt)
}
-const static struct pvr2_i2c_handler_functions hfuncs = {
+static const struct pvr2_i2c_handler_functions hfuncs = {
.detach = (void (*)(void *))decoder_detach,
.check = (int (*)(void *))decoder_check,
.update = (void (*)(void *))decoder_update,
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-std.c b/linux/drivers/media/video/pvrusb2/pvrusb2-std.c
index e4dff8d1c..926b6bfca 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -79,14 +79,14 @@ struct std_name {
#define CSTD_ALL (CSTD_PAL|CSTD_NTSC|CSTD_SECAM)
/* Mapping of standard bits to color system */
-const static struct std_name std_groups[] = {
+static const struct std_name std_groups[] = {
{"PAL",CSTD_PAL},
{"NTSC",CSTD_NTSC},
{"SECAM",CSTD_SECAM},
};
/* Mapping of standard bits to modulation system */
-const static struct std_name std_items[] = {
+static const struct std_name std_items[] = {
{"B",TSTD_B},
{"B1",TSTD_B1},
{"D",TSTD_D},
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c b/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c
index e234cd3c9..c65dbe727 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-tuner.c
@@ -81,7 +81,7 @@ static unsigned int pvr2_tuner_describe(struct pvr2_tuner_handler *ctxt,char *bu
}
-const static struct pvr2_i2c_handler_functions tuner_funcs = {
+static const struct pvr2_i2c_handler_functions tuner_funcs = {
.detach = (void (*)(void *))pvr2_tuner_detach,
.check = (int (*)(void *))tuner_check,
.update = (void (*)(void *))tuner_update,
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
index a842c8fd1..b063110de 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c
@@ -190,7 +190,7 @@ static unsigned int decoder_describe(struct pvr2_v4l_decoder *ctxt,char *buf,uns
}
-const static struct pvr2_i2c_handler_functions hfuncs = {
+static const struct pvr2_i2c_handler_functions hfuncs = {
.detach = (void (*)(void *))decoder_detach,
.check = (int (*)(void *))decoder_check,
.update = (void (*)(void *))decoder_update,
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
index 6bf125213..d578f2491 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-wm8775.c
@@ -131,7 +131,7 @@ static void wm8775_update(struct pvr2_v4l_wm8775 *ctxt)
}
-const static struct pvr2_i2c_handler_functions hfuncs = {
+static const struct pvr2_i2c_handler_functions hfuncs = {
.detach = (void (*)(void *))wm8775_detach,
.check = (int (*)(void *))wm8775_check,
.update = (void (*)(void *))wm8775_update,
diff --git a/linux/sound/oss/btaudio.c b/linux/sound/oss/btaudio.c
index 9a55ff5d0..0285a7082 100644
--- a/linux/sound/oss/btaudio.c
+++ b/linux/sound/oss/btaudio.c
@@ -19,7 +19,6 @@
*/
-#include "compat.h"
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/pci.h>
@@ -41,6 +40,7 @@
#include <asm/uaccess.h>
#include <asm/io.h>
+#include "compat.h"
/* mmio access */
diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl
index bd1ee94e2..1b4e44f26 100755
--- a/v4l/scripts/gentree.pl
+++ b/v4l/scripts/gentree.pl
@@ -87,7 +87,7 @@ sub filter_source ($$) {
$level++;
next;
}
- if ($line =~ m|^\s*\#if\s+0\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) {
+ if ($line =~ m|^\s*\#\s*if\s+0\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) {
if ($1 eq ";") {
print OUT "#if 0\n";
} else {
@@ -132,7 +132,7 @@ sub filter_source ($$) {
$level++;
next;
}
- if ($line =~ m|^\s*\#if\s+1\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) {
+ if ($line =~ m|^\s*\#\s*if\s+1\s*\/[\*]\s*[Kk][Ee].[Pp]\s*[\*]\/(.*)|) {
print OUT "#if 1$1\n";
$state{$level} = "ifother";
$if{$level} = 1;
@@ -180,7 +180,7 @@ sub filter_source ($$) {
$level++;
next;
}
- if ($line =~ /^\s*#\s*ifndef.\s*I2C_PEC/) {
+ if ($line =~ /^\s*#\s*ifndef\s+I2C_PEC/) {
chomp($line);
$state{$level} = "if";
$if{$level} = 0;
@@ -188,7 +188,7 @@ sub filter_source ($$) {
$level++;
next;
}
- if ($line =~ /^\s*#\s*ifdef.\s*I2C_PEC/) {
+ if ($line =~ /^\s*#\s*ifdef\s+I2C_PEC/) {
chomp($line);
$state{$level} = "if";
$if{$level} = 1;
@@ -219,8 +219,36 @@ sub filter_source ($$) {
if ($line =~ /^\s*#\s*if.*LINUX_VERSION_CODE/) {
chomp($line);
$line =~ s@^#if\s*@@;
- $line =~ s@LINUX_VERSION_CODE@\$CODE@;
-print STDERR "/* BP orig: ($line) */\n" if $DEBUG;
+ $line =~ s@LINUX_VERSION_CODE@\$CODE@g;
+ print STDERR "/* BP orig: ($line) */\n" if $DEBUG;
+
+ $line =~ s@KERNEL_VERSION\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)@
+ sprintf("%d",$1*65536 + $2*256 + $3) @eg;
+ $if{$level} = eval $line;
+ $state{$level} = "if";
+ print STDERR "/* BP #if LINUX_VERSION_CODE state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
+ $level++;
+ next;
+ }
+ if ($line =~ /^\s*#\s*elif.*LINUX_VERSION_CODE/) {
+ chomp($line);
+ if ( !$level ) {
+ die "elif without if";
+ }
+ $level--;
+ if ( $if{$level} ) {
+ # Else is 0
+ $if{$level} = 0;
+ $state{$level} = "elif";
+ print STDERR "/* BP #if LINUX_VERSION_CODE state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG;
+
+ $level++;
+ next;
+ }
+
+ $line =~ s@^#if\s*@@;
+ $line =~ s@LINUX_VERSION_CODE@\$CODE@g;
+ print STDERR "/* BP orig: ($line) */\n" if $DEBUG;
$line =~ s@KERNEL_VERSION\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)@
sprintf("%d",$1*65536 + $2*256 + $3) @eg;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 07:44:04 +0000