diff options
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/radio/radio-maestro.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/linux/drivers/media/radio/radio-maestro.c b/linux/drivers/media/radio/radio-maestro.c index 792116a91..5867ccd9d 100644 --- a/linux/drivers/media/radio/radio-maestro.c +++ b/linux/drivers/media/radio/radio-maestro.c @@ -25,9 +25,6 @@ #include <asm/io.h> #include <asm/uaccess.h> #include "compat.h" -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) -#include <linux/mutex.h> -#endif #include <linux/pci.h> #include <linux/videodev2.h> #include <media/v4l2-common.h> @@ -113,11 +110,6 @@ struct radio_device { muted, /* VIDEO_AUDIO_MUTE */ stereo, /* VIDEO_TUNER_STEREO_ON */ tuned; /* signal strength (0 or 0xffff) */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) - struct mutex lock; -#else - struct semaphore lock; -#endif }; static u32 radio_bits_get(struct radio_device *dev) @@ -401,7 +393,6 @@ static int __devinit maestro_probe(struct pci_dev *pdev, } radio_unit->io = pci_resource_start(pdev, 0) + GPIO_DATA; - mutex_init(&radio_unit->lock); maestro_radio_inst = video_device_alloc(); if (maestro_radio_inst == NULL) { |