diff options
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_net.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 1 | ||||
| -rw-r--r-- | v4l/compat.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index 9d2869f67..5f3c9b71f 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -64,7 +64,7 @@ #include <linux/crc32.h> #include "compat.h" #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) -#include <linux/mutex> +#include <linux/mutex.h> #endif #include "dvb_demux.h" diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index 622d5f54f..245db934f 100644 --- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c @@ -93,7 +93,6 @@ struct ttusb { struct semaphore semusb; #endif - struct dvb_adapter adapter; struct usb_device *dev; diff --git a/v4l/compat.h b/v4l/compat.h index 774afc8da..9efcfebd1 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -276,6 +276,7 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) #define mutex_unlock(a) up(a) #define mutex_lock(a) down(a) #define mutex_init(a) init_MUTEX(a) +#define mutex_trylock(a) down_trylock(a) #endif #endif |