Merge branch 'master' into for-upstream

[linux-2.6-omap-h63xx.git] / drivers / media / video / zc0301 / zc0301_pb0330.c

diff --git a/drivers/media/video/zc0301/zc0301_pb0330.c b/drivers/media/video/zc0301/zc0301_pb0330.c
index ed8542e6c50f5d361bc06c5d138e2a950fad066d..9519aba3612ed7fa90e1d3d9e9bcb4649baebf7e 100644 (file)
--- a/drivers/media/video/zc0301/zc0301_pb0330.c
+++ b/drivers/media/video/zc0301/zc0301_pb0330.c
@@ -1,8 +1,8 @@
 /***************************************************************************
- * Plug-in for PB-0330 image sensor connected to the ZC0301[P] Image       *
+ * Plug-in for PB-0330 image sensor connected to the ZC0301P Image         *
  * Processor and Control Chip                                              *
  *                                                                         *
- * Copyright (C) 2006 by Luca Risolia <luca.risolia@studio.unibo.it>       *
+ * Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it>  *
  *                                                                         *
  * Initialization values of the ZC0301[P] have been taken from the SPCA5XX *
  * driver maintained by Michel Xhaard <mxhaard@magic.fr>                   *
@@ -157,6 +157,7 @@ static struct zc0301_sensor pb0330 = {
                .height = 480,
                .pixelformat = V4L2_PIX_FMT_JPEG,
                .priv = 8,
+               .colorspace = V4L2_COLORSPACE_JPEG,
        },
 };