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

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

diff --git a/drivers/media/video/tcm825x.h b/drivers/media/video/tcm825x.h
index 770ebacfa344a109663d533f9dc049a226409bd1..5b7e69682368c6189a2965386ced056e7ba5ac48 100644 (file)
--- a/drivers/media/video/tcm825x.h
+++ b/drivers/media/video/tcm825x.h
@@ -188,7 +188,7 @@ struct tcm825x_platform_data {
 /* Array of image sizes supported by TCM825X.  These must be ordered from
  * smallest image size to largest.
  */
-const static struct capture_size tcm825x_sizes[] = {
+static const struct capture_size tcm825x_sizes[] = {
        { 128,  96 }, /* subQCIF */
        { 160, 120 }, /* QQVGA */
        { 176, 144 }, /* QCIF */