diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
| commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
| tree | 64b6b9655e944284937f5eeff643f0754f35d0af /drivers/media/video/ak881x.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'drivers/media/video/ak881x.c')
| -rw-r--r-- | drivers/media/video/ak881x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/ak881x.c b/drivers/media/video/ak881x.c index 35390d4717b9..1573392f74bd 100644 --- a/drivers/media/video/ak881x.c +++ b/drivers/media/video/ak881x.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/i2c.h> | 11 | #include <linux/i2c.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/videodev2.h> | 15 | #include <linux/videodev2.h> |
| 15 | 16 | ||
| 16 | #include <media/ak881x.h> | 17 | #include <media/ak881x.h> |
| @@ -141,7 +142,7 @@ static int ak881x_s_mbus_fmt(struct v4l2_subdev *sd, | |||
| 141 | return ak881x_try_g_mbus_fmt(sd, mf); | 142 | return ak881x_try_g_mbus_fmt(sd, mf); |
| 142 | } | 143 | } |
| 143 | 144 | ||
| 144 | static int ak881x_enum_mbus_fmt(struct v4l2_subdev *sd, int index, | 145 | static int ak881x_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned int index, |
| 145 | enum v4l2_mbus_pixelcode *code) | 146 | enum v4l2_mbus_pixelcode *code) |
| 146 | { | 147 | { |
| 147 | if (index) | 148 | if (index) |