diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-17 23:50:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:17:52 -0400 |
commit | f87086e302300fdff1bd32049deb7a7f3e3de7da (patch) | |
tree | 27b42587cf577a63d9f79ccb27267e0dea7188cb /drivers/media/video/bt8xx | |
parent | e01117c81676dc9897f567e32cdc13a26e85280b (diff) |
v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10
Also remove some blank lines that were used to split compat code at -devel
tree.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/bt8xx')
-rw-r--r-- | drivers/media/video/bt8xx/bt832.c | 1 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 1 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 3 |
3 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/bt8xx/bt832.c b/drivers/media/video/bt8xx/bt832.c index f92f06dec0d0..216fc9680e80 100644 --- a/drivers/media/video/bt8xx/bt832.c +++ b/drivers/media/video/bt8xx/bt832.c | |||
@@ -179,7 +179,6 @@ static int bt832_attach(struct i2c_adapter *adap, int addr, int kind) | |||
179 | 179 | ||
180 | v4l_info(&t->client,"chip found @ 0x%x\n", addr<<1); | 180 | v4l_info(&t->client,"chip found @ 0x%x\n", addr<<1); |
181 | 181 | ||
182 | |||
183 | if(! bt832_init(&t->client)) { | 182 | if(! bt832_init(&t->client)) { |
184 | bt832_detach(&t->client); | 183 | bt832_detach(&t->client); |
185 | return -1; | 184 | return -1; |
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h index f2393202904b..6d93d16c96e4 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h | |||
@@ -299,7 +299,6 @@ extern int bttv_write_gpio(unsigned int card, | |||
299 | /* ---------------------------------------------------------- */ | 299 | /* ---------------------------------------------------------- */ |
300 | /* sysfs/driver-moded based gpio access interface */ | 300 | /* sysfs/driver-moded based gpio access interface */ |
301 | 301 | ||
302 | |||
303 | struct bttv_sub_device { | 302 | struct bttv_sub_device { |
304 | struct device dev; | 303 | struct device dev; |
305 | struct bttv_core *core; | 304 | struct bttv_core *core; |
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index 955e6bcd8ae0..08ef54a22c9e 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h | |||
@@ -39,7 +39,6 @@ | |||
39 | #include <linux/scatterlist.h> | 39 | #include <linux/scatterlist.h> |
40 | #include <asm/io.h> | 40 | #include <asm/io.h> |
41 | #include <media/v4l2-common.h> | 41 | #include <media/v4l2-common.h> |
42 | |||
43 | #include <linux/device.h> | 42 | #include <linux/device.h> |
44 | #include <media/videobuf-dma-sg.h> | 43 | #include <media/videobuf-dma-sg.h> |
45 | #include <media/tveeprom.h> | 44 | #include <media/tveeprom.h> |
@@ -263,12 +262,10 @@ extern struct videobuf_queue_ops bttv_vbi_qops; | |||
263 | /* ---------------------------------------------------------- */ | 262 | /* ---------------------------------------------------------- */ |
264 | /* bttv-gpio.c */ | 263 | /* bttv-gpio.c */ |
265 | 264 | ||
266 | |||
267 | extern struct bus_type bttv_sub_bus_type; | 265 | extern struct bus_type bttv_sub_bus_type; |
268 | int bttv_sub_add_device(struct bttv_core *core, char *name); | 266 | int bttv_sub_add_device(struct bttv_core *core, char *name); |
269 | int bttv_sub_del_devices(struct bttv_core *core); | 267 | int bttv_sub_del_devices(struct bttv_core *core); |
270 | 268 | ||
271 | |||
272 | /* ---------------------------------------------------------- */ | 269 | /* ---------------------------------------------------------- */ |
273 | /* bttv-driver.c */ | 270 | /* bttv-driver.c */ |
274 | 271 | ||