aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/msp3400-driver.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-17 23:50:58 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:17:52 -0400
commitf87086e302300fdff1bd32049deb7a7f3e3de7da (patch)
tree27b42587cf577a63d9f79ccb27267e0dea7188cb /drivers/media/video/msp3400-driver.c
parente01117c81676dc9897f567e32cdc13a26e85280b (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/msp3400-driver.c')
-rw-r--r--drivers/media/video/msp3400-driver.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index 310dbaba55f..5691e019d19 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -110,6 +110,7 @@ MODULE_PARM_DESC(dolby, "Activates Dolby processsing");
110 110
111/* Addresses to scan */ 111/* Addresses to scan */
112static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END }; 112static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END };
113
113I2C_CLIENT_INSMOD; 114I2C_CLIENT_INSMOD;
114 115
115/* ----------------------------------------------------------------------- */ 116/* ----------------------------------------------------------------------- */
@@ -333,7 +334,6 @@ void msp_set_audio(struct i2c_client *client)
333 334
334/* ------------------------------------------------------------------------ */ 335/* ------------------------------------------------------------------------ */
335 336
336
337static void msp_wake_thread(struct i2c_client *client) 337static void msp_wake_thread(struct i2c_client *client)
338{ 338{
339 struct msp_state *state = i2c_get_clientdata(client); 339 struct msp_state *state = i2c_get_clientdata(client);
@@ -1004,7 +1004,6 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
1004 .id_table = msp_id, 1004 .id_table = msp_id,
1005}; 1005};
1006 1006
1007
1008/* 1007/*
1009 * Overrides for Emacs so that we follow Linus's tabbing style. 1008 * Overrides for Emacs so that we follow Linus's tabbing style.
1010 * --------------------------------------------------------------------------- 1009 * ---------------------------------------------------------------------------