Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	include/linux/serial_sci.h

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index c9a5bbfa6ab5..b8289c2f609b 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -66,7 +66,7 @@ struct soc_camera_host_ops {
          * .get_formats() fail, .put_formats() will not be called at all, the
          * failing .get_formats() must then clean up internally.
          */
-        int (*get_formats)(struct soc_camera_device *, int,
+        int (*get_formats)(struct soc_camera_device *, unsigned int,
                            struct soc_camera_format_xlate *);
         void (*put_formats)(struct soc_camera_device *);
         int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *);