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 /include/media | |
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 'include/media')
-rw-r--r-- | include/media/pwc-ioctl.h | 3 | ||||
-rw-r--r-- | include/media/v4l2-i2c-drv-legacy.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/media/pwc-ioctl.h b/include/media/pwc-ioctl.h index adc1254e887e..0f19779c4634 100644 --- a/include/media/pwc-ioctl.h +++ b/include/media/pwc-ioctl.h | |||
@@ -55,8 +55,7 @@ | |||
55 | #include <linux/types.h> | 55 | #include <linux/types.h> |
56 | #include <linux/version.h> | 56 | #include <linux/version.h> |
57 | 57 | ||
58 | 58 | /* Enumeration of image sizes */ | |
59 | /* Enumeration of image sizes */ | ||
60 | #define PSZ_SQCIF 0x00 | 59 | #define PSZ_SQCIF 0x00 |
61 | #define PSZ_QSIF 0x01 | 60 | #define PSZ_QSIF 0x01 |
62 | #define PSZ_QCIF 0x02 | 61 | #define PSZ_QCIF 0x02 |
diff --git a/include/media/v4l2-i2c-drv-legacy.h b/include/media/v4l2-i2c-drv-legacy.h index 878562278b67..975ffbf4e2c5 100644 --- a/include/media/v4l2-i2c-drv-legacy.h +++ b/include/media/v4l2-i2c-drv-legacy.h | |||
@@ -68,7 +68,6 @@ static int v4l2_i2c_drv_detach_legacy(struct i2c_client *client) | |||
68 | if (err) | 68 | if (err) |
69 | return err; | 69 | return err; |
70 | kfree(client); | 70 | kfree(client); |
71 | |||
72 | return 0; | 71 | return 0; |
73 | } | 72 | } |
74 | 73 | ||