Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux

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

diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index 29991d1cf13e185fae6090f7a0467b490e2689a9..b30c492482175ada8427e87ce36bc8a80405d17d 100644 (file)
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -50,7 +50,7 @@ struct tcm825x_sensor {
 };
 
 /* list of image formats supported by TCM825X sensor */
-const static struct v4l2_fmtdesc tcm825x_formats[] = {
+static const struct v4l2_fmtdesc tcm825x_formats[] = {
        {
                .description = "YUYV (YUV 4:2:2), packed",
                .pixelformat = V4L2_PIX_FMT_UYVY,
@@ -76,15 +76,15 @@ const static struct v4l2_fmtdesc tcm825x_formats[] = {
  * TCM825X register configuration for all combinations of pixel format and
  * image size
  */
-const static struct tcm825x_reg subqcif        =       { 0x20, TCM825X_PICSIZ };
-const static struct tcm825x_reg qcif   =       { 0x18, TCM825X_PICSIZ };
-const static struct tcm825x_reg cif    =       { 0x14, TCM825X_PICSIZ };
-const static struct tcm825x_reg qqvga  =       { 0x0c, TCM825X_PICSIZ };
-const static struct tcm825x_reg qvga   =       { 0x04, TCM825X_PICSIZ };
-const static struct tcm825x_reg vga    =       { 0x00, TCM825X_PICSIZ };
+static const struct tcm825x_reg subqcif        =       { 0x20, TCM825X_PICSIZ };
+static const struct tcm825x_reg qcif   =       { 0x18, TCM825X_PICSIZ };
+static const struct tcm825x_reg cif    =       { 0x14, TCM825X_PICSIZ };
+static const struct tcm825x_reg qqvga  =       { 0x0c, TCM825X_PICSIZ };
+static const struct tcm825x_reg qvga   =       { 0x04, TCM825X_PICSIZ };
+static const struct tcm825x_reg vga    =       { 0x00, TCM825X_PICSIZ };
 
-const static struct tcm825x_reg yuv422 =       { 0x00, TCM825X_PICFMT };
-const static struct tcm825x_reg rgb565 =       { 0x02, TCM825X_PICFMT };
+static const struct tcm825x_reg yuv422 =       { 0x00, TCM825X_PICFMT };
+static const struct tcm825x_reg rgb565 =       { 0x02, TCM825X_PICFMT };
 
 /* Our own specific controls */
 #define V4L2_CID_ALC                           V4L2_CID_PRIVATE_BASE
@@ -248,10 +248,10 @@ static struct vcontrol {
 };
 
 
-const static struct tcm825x_reg *tcm825x_siz_reg[NUM_IMAGE_SIZES] =
+static const struct tcm825x_reg *tcm825x_siz_reg[NUM_IMAGE_SIZES] =
 { &subqcif, &qqvga, &qcif, &qvga, &cif, &vga };
 
-const static struct tcm825x_reg *tcm825x_fmt_reg[NUM_PIXEL_FORMATS] =
+static const struct tcm825x_reg *tcm825x_fmt_reg[NUM_PIXEL_FORMATS] =
 { &yuv422, &rgb565 };
 
 /*