Merge tag 'drm-intel-next-fixes-2015-04-25' of git://anongit.freedesktop.org/drm...

[cascardo/linux.git] / Documentation / DocBook / media / v4l / pixfmt-packed-rgb.xml

diff --git a/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml b/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml
index 6ab4f0f..b60fb93 100644 (file)
--- a/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml
+++ b/Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml
@@ -303,45 +303,6 @@ for a pixel lie next to each other in memory.</para>
            <entry>b<subscript>1</subscript></entry>
            <entry>b<subscript>0</subscript></entry>
          </row>
-         <row id="V4L2-PIX-FMT-BGR666">
-           <entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>
-           <entry>'BGRH'</entry>
-           <entry></entry>
-           <entry>b<subscript>5</subscript></entry>
-           <entry>b<subscript>4</subscript></entry>
-           <entry>b<subscript>3</subscript></entry>
-           <entry>b<subscript>2</subscript></entry>
-           <entry>b<subscript>1</subscript></entry>
-           <entry>b<subscript>0</subscript></entry>
-           <entry>g<subscript>5</subscript></entry>
-           <entry>g<subscript>4</subscript></entry>
-           <entry></entry>
-           <entry>g<subscript>3</subscript></entry>
-           <entry>g<subscript>2</subscript></entry>
-           <entry>g<subscript>1</subscript></entry>
-           <entry>g<subscript>0</subscript></entry>
-           <entry>r<subscript>5</subscript></entry>
-           <entry>r<subscript>4</subscript></entry>
-           <entry>r<subscript>3</subscript></entry>
-           <entry>r<subscript>2</subscript></entry>
-           <entry></entry>
-           <entry>r<subscript>1</subscript></entry>
-           <entry>r<subscript>0</subscript></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-           <entry></entry>
-         </row>
          <row id="V4L2-PIX-FMT-BGR24">
            <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>
            <entry>'BGR3'</entry>
@@ -404,6 +365,46 @@ for a pixel lie next to each other in memory.</para>
            <entry>b<subscript>1</subscript></entry>
            <entry>b<subscript>0</subscript></entry>
          </row>
+         <row id="V4L2-PIX-FMT-BGR666">
+           <entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>
+           <entry>'BGRH'</entry>
+           <entry></entry>
+           <entry>b<subscript>5</subscript></entry>
+           <entry>b<subscript>4</subscript></entry>
+           <entry>b<subscript>3</subscript></entry>
+           <entry>b<subscript>2</subscript></entry>
+           <entry>b<subscript>1</subscript></entry>
+           <entry>b<subscript>0</subscript></entry>
+           <entry>g<subscript>5</subscript></entry>
+           <entry>g<subscript>4</subscript></entry>
+           <entry></entry>
+           <entry>g<subscript>3</subscript></entry>
+           <entry>g<subscript>2</subscript></entry>
+           <entry>g<subscript>1</subscript></entry>
+           <entry>g<subscript>0</subscript></entry>
+           <entry>r<subscript>5</subscript></entry>
+           <entry>r<subscript>4</subscript></entry>
+           <entry>r<subscript>3</subscript></entry>
+           <entry>r<subscript>2</subscript></entry>
+           <entry></entry>
+           <entry>r<subscript>1</subscript></entry>
+           <entry>r<subscript>0</subscript></entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry></entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry>-</entry>
+           <entry>-</entry>
+         </row>
          <row id="V4L2-PIX-FMT-ABGR32">
            <entry><constant>V4L2_PIX_FMT_ABGR32</constant></entry>
            <entry>'AR24'</entry>