Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

15 files changed, 15 insertions, 0 deletions

diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index c2ebe8754a95..dc292da2605f 100644
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -220,6 +220,7 @@ static struct file_operations pcm20_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = pcm20_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 877c770558e9..914deab4e044 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -299,6 +299,7 @@ static struct file_operations rtrack_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = rt_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 5319a9c9a979..523be820f9c6 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -256,6 +256,7 @@ static struct file_operations aztech_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = az_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 9b0406318f2d..f1b5ac81e9d2 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -490,6 +490,7 @@ static struct file_operations cadet_fops = {
         .release        = cadet_release,
         .read           = cadet_read,
         .ioctl          = cadet_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 630cc786d0a4..42c8fce04aa2 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -301,6 +301,7 @@ static struct file_operations gemtek_pci_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = gemtek_pci_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 6418f03b9ce4..47173be97b9f 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -233,6 +233,7 @@ static struct file_operations gemtek_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = gemtek_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index e5e2021a7312..c30effdf711f 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -72,6 +72,7 @@ static struct file_operations maestro_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = radio_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 02d39a50d5ed..30869308332a 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -80,6 +80,7 @@ static struct file_operations maxiradio_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = radio_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 static struct video_device maxiradio_radio =
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index b2256d675b44..28a47c9e7a81 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -199,6 +199,7 @@ static struct file_operations rtrack2_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = rt_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 6f03ce4dd7b0..0229f792a059 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -225,6 +225,7 @@ static struct file_operations fmi_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = fmi_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 71971e9bb342..26632cead09a 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -356,6 +356,7 @@ static struct file_operations fmr2_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = fmr2_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index b03573c6840e..fcfde2e4f195 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -276,6 +276,7 @@ static struct file_operations terratec_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = tt_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index b300bedf7c74..5a099a50d4d0 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -255,6 +255,7 @@ static struct file_operations trust_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = tr_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index f304f3c14763..8ac9a8ef9094 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -261,6 +261,7 @@ static struct file_operations typhoon_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = typhoon_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 4c6d6fb49034..d590e80c922e 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -313,6 +313,7 @@ static struct file_operations zoltrix_fops =
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = zol_ioctl,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .llseek         = no_llseek,
 };