git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
media
/
dvb
/
bt8xx
/
bt878.h
diff --git
a/drivers/media/dvb/bt8xx/bt878.h
b/drivers/media/dvb/bt8xx/bt878.h
index
f685bc1
..
9faf937
100644
(file)
--- a/
drivers/media/dvb/bt8xx/bt878.h
+++ b/
drivers/media/dvb/bt8xx/bt878.h
@@
-25,8
+25,6
@@
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/spinlock.h>
-#include <linux/mutex.h>
-
#include "bt848.h"
#include "bttv.h"
#include "bt848.h"
#include "bttv.h"
@@
-110,7
+108,7
@@
struct cards {
extern int bt878_num;
struct bt878 {
extern int bt878_num;
struct bt878 {
- struct
mutex
gpio_lock;
+ struct
semaphore
gpio_lock;
unsigned int nr;
unsigned int bttv_nr;
struct i2c_adapter *adapter;
unsigned int nr;
unsigned int bttv_nr;
struct i2c_adapter *adapter;