Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / solo6x10 / solo6010-osd-font.h

diff --git a/drivers/staging/solo6x10/solo6010-osd-font.h b/drivers/staging/solo6x10/solo6010-osd-font.h
index d6f565bd76cc619afe081f10208e24893408f7d7..d72efbb3bb3d4e29aa756d91b34189bc2d1fd0be 100644 (file)
--- a/drivers/staging/solo6x10/solo6010-osd-font.h
+++ b/drivers/staging/solo6x10/solo6010-osd-font.h
@@ -22,7 +22,7 @@
 
 static const unsigned int solo_osd_font[] = {
        0x00000000, 0x0000c0c8, 0xccfefe0c, 0x08000000,
-       0x00000000, 0x10103838, 0x7c7cfefe, 0x00000000, // 0
+       0x00000000, 0x10103838, 0x7c7cfefe, 0x00000000, /* 0 */
        0x00000000, 0xfefe7c7c, 0x38381010, 0x10000000,
        0x00000000, 0x7c82fefe, 0xfefefe7c, 0x00000000,
        0x00000000, 0x00001038, 0x10000000, 0x00000000,
@@ -54,67 +54,67 @@ static const unsigned int solo_osd_font[] = {
        0x0000003f, 0x7f404c52, 0x524c407f, 0x00000000,
        0x0000007c, 0x82ba82ba, 0x82ba82fe, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00000000,
-       0x00000000, 0x183c3c3c, 0x18180018, 0x18000000, // 32   !
+       0x00000000, 0x183c3c3c, 0x18180018, 0x18000000, /* 32   ! */
        0x00000066, 0x66240000, 0x00000000, 0x00000000,
-       0x00000000, 0x6c6cfe6c, 0x6c6cfe6c, 0x6c000000, // 34 " #
+       0x00000000, 0x6c6cfe6c, 0x6c6cfe6c, 0x6c000000, /* 34 " # */
        0x00001010, 0x7cd6d616, 0x7cd0d6d6, 0x7c101000,
-       0x00000000, 0x0086c660, 0x30180cc6, 0xc2000000, // 36 $ %
+       0x00000000, 0x0086c660, 0x30180cc6, 0xc2000000, /* 36 $ % */
        0x00000000, 0x386c6c38, 0xdc766666, 0xdc000000,
-       0x0000000c, 0x0c0c0600, 0x00000000, 0x00000000, // 38 & '
+       0x0000000c, 0x0c0c0600, 0x00000000, 0x00000000, /* 38 & ' */
        0x00000000, 0x30180c0c, 0x0c0c0c18, 0x30000000,
-       0x00000000, 0x0c183030, 0x30303018, 0x0c000000, // 40 ( )
+       0x00000000, 0x0c183030, 0x30303018, 0x0c000000, /* 40 ( ) */
        0x00000000, 0x0000663c, 0xff3c6600, 0x00000000,
-       0x00000000, 0x00001818, 0x7e181800, 0x00000000, // 42 * +
+       0x00000000, 0x00001818, 0x7e181800, 0x00000000, /* 42 * + */
        0x00000000, 0x00000000, 0x00000e0e, 0x0c060000,
-       0x00000000, 0x00000000, 0x7e000000, 0x00000000, // 44 , -
+       0x00000000, 0x00000000, 0x7e000000, 0x00000000, /* 44 , - */
        0x00000000, 0x00000000, 0x00000006, 0x06000000,
-       0x00000000, 0x80c06030, 0x180c0602, 0x00000000, // 46 . /
+       0x00000000, 0x80c06030, 0x180c0602, 0x00000000, /* 46 . / */
        0x0000007c, 0xc6e6f6de, 0xcec6c67c, 0x00000000,
-       0x00000030, 0x383c3030, 0x303030fc, 0x00000000, // 48 0 1
+       0x00000030, 0x383c3030, 0x303030fc, 0x00000000, /* 48 0 1 */
        0x0000007c, 0xc6c06030, 0x180cc6fe, 0x00000000,
-       0x0000007c, 0xc6c0c07c, 0xc0c0c67c, 0x00000000, // 50 2 3
+       0x0000007c, 0xc6c0c07c, 0xc0c0c67c, 0x00000000, /* 50 2 3 */
        0x00000060, 0x70786c66, 0xfe6060f0, 0x00000000,
-       0x000000fe, 0x0606067e, 0xc0c0c67c, 0x00000000, // 52 4 5
+       0x000000fe, 0x0606067e, 0xc0c0c67c, 0x00000000, /* 52 4 5 */
        0x00000038, 0x0c06067e, 0xc6c6c67c, 0x00000000,
-       0x000000fe, 0xc6c06030, 0x18181818, 0x00000000, // 54 6 7
+       0x000000fe, 0xc6c06030, 0x18181818, 0x00000000, /* 54 6 7 */
        0x0000007c, 0xc6c6c67c, 0xc6c6c67c, 0x00000000,
-       0x0000007c, 0xc6c6c6fc, 0xc0c06038, 0x00000000, // 56 8 9
+       0x0000007c, 0xc6c6c6fc, 0xc0c06038, 0x00000000, /* 56 8 9 */
        0x00000000, 0x18180000, 0x00181800, 0x00000000,
-       0x00000000, 0x18180000, 0x0018180c, 0x00000000, // 58 : ;
+       0x00000000, 0x18180000, 0x0018180c, 0x00000000, /* 58 : ; */
        0x00000060, 0x30180c06, 0x0c183060, 0x00000000,
        0x00000000, 0x007e0000, 0x007e0000, 0x00000000,
        0x00000006, 0x0c183060, 0x30180c06, 0x00000000,
        0x0000007c, 0xc6c66030, 0x30003030, 0x00000000,
        0x0000007c, 0xc6f6d6d6, 0x7606067c, 0x00000000,
-       0x00000010, 0x386cc6c6, 0xfec6c6c6, 0x00000000, // 64 @ A
+       0x00000010, 0x386cc6c6, 0xfec6c6c6, 0x00000000, /* 64 @ A */
        0x0000007e, 0xc6c6c67e, 0xc6c6c67e, 0x00000000,
-       0x00000078, 0xcc060606, 0x0606cc78, 0x00000000, // 66
+       0x00000078, 0xcc060606, 0x0606cc78, 0x00000000, /* 66 */
        0x0000003e, 0x66c6c6c6, 0xc6c6663e, 0x00000000,
-       0x000000fe, 0x0606063e, 0x060606fe, 0x00000000, // 68
+       0x000000fe, 0x0606063e, 0x060606fe, 0x00000000, /* 68 */
        0x000000fe, 0x0606063e, 0x06060606, 0x00000000,
-       0x00000078, 0xcc060606, 0xf6c6ccb8, 0x00000000, // 70
+       0x00000078, 0xcc060606, 0xf6c6ccb8, 0x00000000, /* 70 */
        0x000000c6, 0xc6c6c6fe, 0xc6c6c6c6, 0x00000000,
-       0x0000003c, 0x18181818, 0x1818183c, 0x00000000, // 72
+       0x0000003c, 0x18181818, 0x1818183c, 0x00000000, /* 72 */
        0x00000060, 0x60606060, 0x6066663c, 0x00000000,
-       0x000000c6, 0xc666361e, 0x3666c6c6, 0x00000000, // 74
+       0x000000c6, 0xc666361e, 0x3666c6c6, 0x00000000, /* 74 */
        0x00000006, 0x06060606, 0x060606fe, 0x00000000,
-       0x000000c6, 0xeefed6c6, 0xc6c6c6c6, 0x00000000, // 76
+       0x000000c6, 0xeefed6c6, 0xc6c6c6c6, 0x00000000, /* 76 */
        0x000000c6, 0xcedefef6, 0xe6c6c6c6, 0x00000000,
-       0x00000038, 0x6cc6c6c6, 0xc6c66c38, 0x00000000, // 78
+       0x00000038, 0x6cc6c6c6, 0xc6c66c38, 0x00000000, /* 78 */
        0x0000007e, 0xc6c6c67e, 0x06060606, 0x00000000,
-       0x00000038, 0x6cc6c6c6, 0xc6d67c38, 0x60000000, // 80
+       0x00000038, 0x6cc6c6c6, 0xc6d67c38, 0x60000000, /* 80 */
        0x0000007e, 0xc6c6c67e, 0x66c6c6c6, 0x00000000,
-       0x0000007c, 0xc6c60c38, 0x60c6c67c, 0x00000000, // 82
+       0x0000007c, 0xc6c60c38, 0x60c6c67c, 0x00000000, /* 82 */
        0x0000007e, 0x18181818, 0x18181818, 0x00000000,
-       0x000000c6, 0xc6c6c6c6, 0xc6c6c67c, 0x00000000, // 84
+       0x000000c6, 0xc6c6c6c6, 0xc6c6c67c, 0x00000000, /* 84 */
        0x000000c6, 0xc6c6c6c6, 0xc66c3810, 0x00000000,
-       0x000000c6, 0xc6c6c6c6, 0xd6d6fe6c, 0x00000000, // 86
+       0x000000c6, 0xc6c6c6c6, 0xd6d6fe6c, 0x00000000, /* 86 */
        0x000000c6, 0xc6c66c38, 0x6cc6c6c6, 0x00000000,
-       0x00000066, 0x66666666, 0x3c181818, 0x00000000, // 88
+       0x00000066, 0x66666666, 0x3c181818, 0x00000000, /* 88 */
        0x000000fe, 0xc0603018, 0x0c0606fe, 0x00000000,
-       0x0000003c, 0x0c0c0c0c, 0x0c0c0c3c, 0x00000000, // 90
+       0x0000003c, 0x0c0c0c0c, 0x0c0c0c3c, 0x00000000, /* 90 */
        0x00000002, 0x060c1830, 0x60c08000, 0x00000000,
-       0x0000003c, 0x30303030, 0x3030303c, 0x00000000, // 92
+       0x0000003c, 0x30303030, 0x3030303c, 0x00000000, /* 92 */
        0x00001038, 0x6cc60000, 0x00000000, 0x00000000,
        0x00000000, 0x00000000, 0x00000000, 0x00fe0000,
        0x00001818, 0x30000000, 0x00000000, 0x00000000,