diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-11 17:17:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-11 17:17:38 -0300 |
| commit | c271ec73f1129f6e81861829f463dae7ce2315d5 (patch) | |
| tree | 273b7bfdd74cfec5e5118ed575134b88e46590d5 /linux/drivers | |
| parent | 790b1162d78755ecad42e57486dce29be2377781 (diff) | |
| download | mediapointer-dvb-s2-c271ec73f1129f6e81861829f463dae7ce2315d5.tar.gz mediapointer-dvb-s2-c271ec73f1129f6e81861829f463dae7ce2315d5.tar.bz2 | |
Adjust some compat changes to be no changes at all for -git kernel
From: Trent Piepho <xyzzy@speakeasy.org>
Some of the compat changes produced cosmetic differences when applied to
kernel. This removes those differences.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/radio/radio-maestro.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/radio/radio-sf16fmi.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/linux/drivers/media/radio/radio-maestro.c b/linux/drivers/media/radio/radio-maestro.c index dfa1e6ded..0a1ea1ce7 100644 --- a/linux/drivers/media/radio/radio-maestro.c +++ b/linux/drivers/media/radio/radio-maestro.c @@ -23,12 +23,12 @@ #include <linux/sched.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <linux/pci.h> #include "compat.h" -#include <linux/videodev.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> #endif +#include <linux/pci.h> +#include <linux/videodev.h> #define DRIVER_VERSION "0.05" diff --git a/linux/drivers/media/radio/radio-sf16fmi.c b/linux/drivers/media/radio/radio-sf16fmi.c index 62bb19d2c..928ac9b2d 100644 --- a/linux/drivers/media/radio/radio-sf16fmi.c +++ b/linux/drivers/media/radio/radio-sf16fmi.c @@ -27,10 +27,6 @@ #include <asm/uaccess.h> /* copy to/from user */ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> - -static struct mutex lock; -#else -static struct semaphore lock; #endif struct fmi_device @@ -44,6 +40,11 @@ struct fmi_device static int io = -1; static int radio_nr = -1; static struct pnp_dev *dev = NULL; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) +static struct mutex lock; +#else +static struct semaphore lock; +#endif /* freq is in 1/16 kHz to internal number, hw precision is 50 kHz */ /* It is only useful to give freq in intervall of 800 (=0.05Mhz), |