diff options
Diffstat (limited to 'drivers/media/video/msp3400-driver.c')
-rw-r--r-- | drivers/media/video/msp3400-driver.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c index 310dbaba55ff..3da74dcee902 100644 --- a/drivers/media/video/msp3400-driver.c +++ b/drivers/media/video/msp3400-driver.c | |||
@@ -51,9 +51,9 @@ | |||
51 | #include <linux/module.h> | 51 | #include <linux/module.h> |
52 | #include <linux/slab.h> | 52 | #include <linux/slab.h> |
53 | #include <linux/i2c.h> | 53 | #include <linux/i2c.h> |
54 | #include <linux/videodev.h> | ||
55 | #include <linux/videodev2.h> | 54 | #include <linux/videodev2.h> |
56 | #include <media/v4l2-common.h> | 55 | #include <media/v4l2-common.h> |
56 | #include <media/v4l2-ioctl.h> | ||
57 | #include <media/v4l2-i2c-drv-legacy.h> | 57 | #include <media/v4l2-i2c-drv-legacy.h> |
58 | #include <media/tvaudio.h> | 58 | #include <media/tvaudio.h> |
59 | #include <media/msp3400.h> | 59 | #include <media/msp3400.h> |
@@ -110,6 +110,7 @@ MODULE_PARM_DESC(dolby, "Activates Dolby processsing"); | |||
110 | 110 | ||
111 | /* Addresses to scan */ | 111 | /* Addresses to scan */ |
112 | static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END }; | 112 | static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END }; |
113 | |||
113 | I2C_CLIENT_INSMOD; | 114 | I2C_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 | |||
337 | static void msp_wake_thread(struct i2c_client *client) | 337 | static 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 | * --------------------------------------------------------------------------- |