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/pwc | |
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/pwc')
-rw-r--r-- | drivers/media/video/pwc/pwc-ctrl.c | 2 | ||||
-rw-r--r-- | drivers/media/video/pwc/pwc-ioctl.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c index ea53316d2111..1cccd5c77048 100644 --- a/drivers/media/video/pwc/pwc-ctrl.c +++ b/drivers/media/video/pwc/pwc-ctrl.c | |||
@@ -1255,7 +1255,6 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor) | |||
1255 | exactly the same otherwise. | 1255 | exactly the same otherwise. |
1256 | */ | 1256 | */ |
1257 | 1257 | ||
1258 | |||
1259 | /* define local variable for arg */ | 1258 | /* define local variable for arg */ |
1260 | #define ARG_DEF(ARG_type, ARG_name)\ | 1259 | #define ARG_DEF(ARG_type, ARG_name)\ |
1261 | ARG_type *ARG_name = arg; | 1260 | ARG_type *ARG_name = arg; |
@@ -1268,7 +1267,6 @@ int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor) | |||
1268 | /* copy local variable to arg */ | 1267 | /* copy local variable to arg */ |
1269 | #define ARG_OUT(ARG_name) /* nothing */ | 1268 | #define ARG_OUT(ARG_name) /* nothing */ |
1270 | 1269 | ||
1271 | |||
1272 | int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg) | 1270 | int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg) |
1273 | { | 1271 | { |
1274 | int ret = 0; | 1272 | int ret = 0; |
diff --git a/drivers/media/video/pwc/pwc-ioctl.h b/drivers/media/video/pwc/pwc-ioctl.h index cec660299768..8c0cae7b3daf 100644 --- a/drivers/media/video/pwc/pwc-ioctl.h +++ b/drivers/media/video/pwc/pwc-ioctl.h | |||
@@ -54,7 +54,6 @@ | |||
54 | #include <linux/types.h> | 54 | #include <linux/types.h> |
55 | #include <linux/version.h> | 55 | #include <linux/version.h> |
56 | 56 | ||
57 | |||
58 | /* Enumeration of image sizes */ | 57 | /* Enumeration of image sizes */ |
59 | #define PSZ_SQCIF 0x00 | 58 | #define PSZ_SQCIF 0x00 |
60 | #define PSZ_QSIF 0x01 | 59 | #define PSZ_QSIF 0x01 |