From c271ec73f1129f6e81861829f463dae7ce2315d5 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 11 Apr 2006 17:17:38 -0300 Subject: Adjust some compat changes to be no changes at all for -git kernel From: Trent Piepho Some of the compat changes produced cosmetic differences when applied to kernel. This removes those differences. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/radio/radio-maestro.c | 4 ++-- linux/drivers/media/radio/radio-sf16fmi.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'linux/drivers/media') 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 #include #include -#include #include "compat.h" -#include #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include #endif +#include +#include #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 /* copy to/from user */ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include - -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), -- cgit v1.2.3