Merge branch 'pm-fixes' into pm-domains

Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6 (PM / Clocks: Do not acquire a mutex under a spinlock) fixing a regression in drivers/base/power/clock_ops.c. Conflicts: drivers/base/power/clock_ops.c
author: Rafael J. Wysocki <rjw@sisk.pl> 2011-09-26 14:12:45 -0400
committer: Rafael J. Wysocki <rjw@sisk.pl> 2011-09-26 14:12:45 -0400
commit: 0d41da2e31e81f5c8aaabe17f769de4304b2d4c8 (patch)
tree: 540acefba9bf01d3880d7bacb767fbf9b1fe80b4 /Documentation/DocBook
parent: a0089bd617adea27ebc352e1e0871649ab1dbaa6 (diff)
parent: e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6 (diff)
1 files changed, 19 insertions, 19 deletions
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index 85164016ed26..23fdf79f8cf3 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -1455,7 +1455,7 @@ Applicable to the H264 encoder.</entry>
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-video-h264-vui-sar-idc">
                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC</constant>&nbsp;</entry>
                <entry>enum&nbsp;v4l2_mpeg_video_h264_vui_sar_idc</entry>
              </row>
@@ -1561,7 +1561,7 @@ Applicable to the H264 encoder.</entry>
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-video-h264-level">
                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LEVEL</constant>&nbsp;</entry>
                <entry>enum&nbsp;v4l2_mpeg_video_h264_level</entry>
              </row>
@@ -1641,7 +1641,7 @@ Possible values are:</entry>
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-video-mpeg4-level">
                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL</constant>&nbsp;</entry>
                <entry>enum&nbsp;v4l2_mpeg_video_mpeg4_level</entry>
              </row>
@@ -1689,9 +1689,9 @@ Possible values are:</entry>
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-video-h264-profile">
                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_PROFILE</constant>&nbsp;</entry>
-                <entry>enum&nbsp;v4l2_mpeg_h264_profile</entry>
+                <entry>enum&nbsp;v4l2_mpeg_video_h264_profile</entry>
              </row>
              <row><entry spanname="descr">The profile information for H264.
 Applicable to the H264 encoder.
@@ -1774,9 +1774,9 @@ Possible values are:</entry>
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-video-mpeg4-profile">
                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE</constant>&nbsp;</entry>
-                <entry>enum&nbsp;v4l2_mpeg_mpeg4_profile</entry>
+                <entry>enum&nbsp;v4l2_mpeg_video_mpeg4_profile</entry>
              </row>
              <row><entry spanname="descr">The profile information for MPEG4.
 Applicable to the MPEG4 encoder.
@@ -1820,9 +1820,9 @@ Applicable to the encoder.
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-video-multi-slice-mode">
                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE</constant>&nbsp;</entry>
-                <entry>enum&nbsp;v4l2_mpeg_multi_slice_mode</entry>
+                <entry>enum&nbsp;v4l2_mpeg_video_multi_slice_mode</entry>
              </row>
              <row><entry spanname="descr">Determines how the encoder should handle division of frame into slices.
 Applicable to the encoder.
@@ -1868,9 +1868,9 @@ Applicable to the encoder.</entry>
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-video-h264-loop-filter-mode">
                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE</constant>&nbsp;</entry>
-                <entry>enum&nbsp;v4l2_mpeg_h264_loop_filter_mode</entry>
+                <entry>enum&nbsp;v4l2_mpeg_video_h264_loop_filter_mode</entry>
              </row>
              <row><entry spanname="descr">Loop filter mode for H264 encoder.
 Possible values are:</entry>
@@ -1913,9 +1913,9 @@ Applicable to the H264 encoder.</entry>
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-video-h264-entropy-mode">
                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE</constant>&nbsp;</entry>
-                <entry>enum&nbsp;v4l2_mpeg_h264_symbol_mode</entry>
+                <entry>enum&nbsp;v4l2_mpeg_video_h264_entropy_mode</entry>
              </row>
              <row><entry spanname="descr">Entropy coding mode for H264 - CABAC/CAVALC.
 Applicable to the H264 encoder.
@@ -2140,9 +2140,9 @@ previous frames. Applicable to the H264 encoder.</entry>
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-video-header-mode">
                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_HEADER_MODE</constant>&nbsp;</entry>
-                <entry>enum&nbsp;v4l2_mpeg_header_mode</entry>
+                <entry>enum&nbsp;v4l2_mpeg_video_header_mode</entry>
              </row>
              <row><entry spanname="descr">Determines whether the header is returned as the first buffer or is
 it returned together with the first frame. Applicable to encoders.
@@ -2320,9 +2320,9 @@ Valid only when H.264 and macroblock level RC is enabled (<constant>V4L2_CID_MPE
 Applicable to the H264 encoder.</entry>
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-mfc51-video-frame-skip-mode">
                <entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE</constant>&nbsp;</entry>
-                <entry>enum&nbsp;v4l2_mpeg_mfc51_frame_skip_mode</entry>
+                <entry>enum&nbsp;v4l2_mpeg_mfc51_video_frame_skip_mode</entry>
              </row>
              <row><entry spanname="descr">
 Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then
@@ -2361,9 +2361,9 @@ the stream will meet tight bandwidth contraints. Applicable to encoders.
 </entry>
              </row>
              <row><entry></entry></row>
-              <row>
+              <row id="v4l2-mpeg-mfc51-video-force-frame-type">
                <entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE</constant>&nbsp;</entry>
-                <entry>enum&nbsp;v4l2_mpeg_mfc51_force_frame_type</entry>
+                <entry>enum&nbsp;v4l2_mpeg_mfc51_video_force_frame_type</entry>
              </row>
              <row><entry spanname="descr">Force a frame type for the next queued buffer. Applicable to encoders.
 Possible values are:</entry>
author	Rafael J. Wysocki <rjw@sisk.pl>	2011-09-26 14:12:45 -0400
committer	Rafael J. Wysocki <rjw@sisk.pl>	2011-09-26 14:12:45 -0400
commit	0d41da2e31e81f5c8aaabe17f769de4304b2d4c8 (patch)
tree	540acefba9bf01d3880d7bacb767fbf9b1fe80b4 /Documentation/DocBook
parent	a0089bd617adea27ebc352e1e0871649ab1dbaa6 (diff)
parent	e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6 (diff)

diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 85164016ed26..23fdf79f8cf3 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -1455,7 +1455,7 @@ Applicable to the H264 encoder.</entry>
1455	</row>	1455	</row>
1456		1456
1457	<row><entry></entry></row>	1457	<row><entry></entry></row>
1458	<row>	1458	<row id="v4l2-mpeg-video-h264-vui-sar-idc">
1459	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC</constant> </entry>	1459	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_VUI_SAR_IDC</constant> </entry>
1460	<entry>enum v4l2_mpeg_video_h264_vui_sar_idc</entry>	1460	<entry>enum v4l2_mpeg_video_h264_vui_sar_idc</entry>
1461	</row>	1461	</row>
@@ -1561,7 +1561,7 @@ Applicable to the H264 encoder.</entry>
1561	</row>	1561	</row>
1562		1562
1563	<row><entry></entry></row>	1563	<row><entry></entry></row>
1564	<row>	1564	<row id="v4l2-mpeg-video-h264-level">
1565	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LEVEL</constant> </entry>	1565	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LEVEL</constant> </entry>
1566	<entry>enum v4l2_mpeg_video_h264_level</entry>	1566	<entry>enum v4l2_mpeg_video_h264_level</entry>
1567	</row>	1567	</row>
@@ -1641,7 +1641,7 @@ Possible values are:</entry>
1641	</row>	1641	</row>
1642		1642
1643	<row><entry></entry></row>	1643	<row><entry></entry></row>
1644	<row>	1644	<row id="v4l2-mpeg-video-mpeg4-level">
1645	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL</constant> </entry>	1645	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL</constant> </entry>
1646	<entry>enum v4l2_mpeg_video_mpeg4_level</entry>	1646	<entry>enum v4l2_mpeg_video_mpeg4_level</entry>
1647	</row>	1647	</row>
@@ -1689,9 +1689,9 @@ Possible values are:</entry>
1689	</row>	1689	</row>
1690		1690
1691	<row><entry></entry></row>	1691	<row><entry></entry></row>
1692	<row>	1692	<row id="v4l2-mpeg-video-h264-profile">
1693	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_PROFILE</constant> </entry>	1693	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_PROFILE</constant> </entry>
1694	<entry>enum v4l2_mpeg_h264_profile</entry>	1694	<entry>enum v4l2_mpeg_video_h264_profile</entry>
1695	</row>	1695	</row>
1696	<row><entry spanname="descr">The profile information for H264.	1696	<row><entry spanname="descr">The profile information for H264.
1697	Applicable to the H264 encoder.	1697	Applicable to the H264 encoder.
@@ -1774,9 +1774,9 @@ Possible values are:</entry>
1774	</row>	1774	</row>
1775		1775
1776	<row><entry></entry></row>	1776	<row><entry></entry></row>
1777	<row>	1777	<row id="v4l2-mpeg-video-mpeg4-profile">
1778	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE</constant> </entry>	1778	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE</constant> </entry>
1779	<entry>enum v4l2_mpeg_mpeg4_profile</entry>	1779	<entry>enum v4l2_mpeg_video_mpeg4_profile</entry>
1780	</row>	1780	</row>
1781	<row><entry spanname="descr">The profile information for MPEG4.	1781	<row><entry spanname="descr">The profile information for MPEG4.
1782	Applicable to the MPEG4 encoder.	1782	Applicable to the MPEG4 encoder.
@@ -1820,9 +1820,9 @@ Applicable to the encoder.
1820	</row>	1820	</row>
1821		1821
1822	<row><entry></entry></row>	1822	<row><entry></entry></row>
1823	<row>	1823	<row id="v4l2-mpeg-video-multi-slice-mode">
1824	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE</constant> </entry>	1824	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE</constant> </entry>
1825	<entry>enum v4l2_mpeg_multi_slice_mode</entry>	1825	<entry>enum v4l2_mpeg_video_multi_slice_mode</entry>
1826	</row>	1826	</row>
1827	<row><entry spanname="descr">Determines how the encoder should handle division of frame into slices.	1827	<row><entry spanname="descr">Determines how the encoder should handle division of frame into slices.
1828	Applicable to the encoder.	1828	Applicable to the encoder.
@@ -1868,9 +1868,9 @@ Applicable to the encoder.</entry>
1868	</row>	1868	</row>
1869		1869
1870	<row><entry></entry></row>	1870	<row><entry></entry></row>
1871	<row>	1871	<row id="v4l2-mpeg-video-h264-loop-filter-mode">
1872	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE</constant> </entry>	1872	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE</constant> </entry>
1873	<entry>enum v4l2_mpeg_h264_loop_filter_mode</entry>	1873	<entry>enum v4l2_mpeg_video_h264_loop_filter_mode</entry>
1874	</row>	1874	</row>
1875	<row><entry spanname="descr">Loop filter mode for H264 encoder.	1875	<row><entry spanname="descr">Loop filter mode for H264 encoder.
1876	Possible values are:</entry>	1876	Possible values are:</entry>
@@ -1913,9 +1913,9 @@ Applicable to the H264 encoder.</entry>
1913	</row>	1913	</row>
1914		1914
1915	<row><entry></entry></row>	1915	<row><entry></entry></row>
1916	<row>	1916	<row id="v4l2-mpeg-video-h264-entropy-mode">
1917	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE</constant> </entry>	1917	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE</constant> </entry>
1918	<entry>enum v4l2_mpeg_h264_symbol_mode</entry>	1918	<entry>enum v4l2_mpeg_video_h264_entropy_mode</entry>
1919	</row>	1919	</row>
1920	<row><entry spanname="descr">Entropy coding mode for H264 - CABAC/CAVALC.	1920	<row><entry spanname="descr">Entropy coding mode for H264 - CABAC/CAVALC.
1921	Applicable to the H264 encoder.	1921	Applicable to the H264 encoder.
@@ -2140,9 +2140,9 @@ previous frames. Applicable to the H264 encoder.</entry>
2140	</row>	2140	</row>
2141		2141
2142	<row><entry></entry></row>	2142	<row><entry></entry></row>
2143	<row>	2143	<row id="v4l2-mpeg-video-header-mode">
2144	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_HEADER_MODE</constant> </entry>	2144	<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_HEADER_MODE</constant> </entry>
2145	<entry>enum v4l2_mpeg_header_mode</entry>	2145	<entry>enum v4l2_mpeg_video_header_mode</entry>
2146	</row>	2146	</row>
2147	<row><entry spanname="descr">Determines whether the header is returned as the first buffer or is	2147	<row><entry spanname="descr">Determines whether the header is returned as the first buffer or is
2148	it returned together with the first frame. Applicable to encoders.	2148	it returned together with the first frame. Applicable to encoders.
@@ -2320,9 +2320,9 @@ Valid only when H.264 and macroblock level RC is enabled (<constant>V4L2_CID_MPE
2320	Applicable to the H264 encoder.</entry>	2320	Applicable to the H264 encoder.</entry>
2321	</row>	2321	</row>
2322	<row><entry></entry></row>	2322	<row><entry></entry></row>
2323	<row>	2323	<row id="v4l2-mpeg-mfc51-video-frame-skip-mode">
2324	<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE</constant> </entry>	2324	<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE</constant> </entry>
2325	<entry>enum v4l2_mpeg_mfc51_frame_skip_mode</entry>	2325	<entry>enum v4l2_mpeg_mfc51_video_frame_skip_mode</entry>
2326	</row>	2326	</row>
2327	<row><entry spanname="descr">	2327	<row><entry spanname="descr">
2328	Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then	2328	Indicates in what conditions the encoder should skip frames. If encoding a frame would cause the encoded stream to be larger then
@@ -2361,9 +2361,9 @@ the stream will meet tight bandwidth contraints. Applicable to encoders.
2361	</entry>	2361	</entry>
2362	</row>	2362	</row>
2363	<row><entry></entry></row>	2363	<row><entry></entry></row>
2364	<row>	2364	<row id="v4l2-mpeg-mfc51-video-force-frame-type">
2365	<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE</constant> </entry>	2365	<entry spanname="id"><constant>V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE</constant> </entry>
2366	<entry>enum v4l2_mpeg_mfc51_force_frame_type</entry>	2366	<entry>enum v4l2_mpeg_mfc51_video_force_frame_type</entry>
2367	</row>	2367	</row>
2368	<row><entry spanname="descr">Force a frame type for the next queued buffer. Applicable to encoders.	2368	<row><entry spanname="descr">Force a frame type for the next queued buffer. Applicable to encoders.
2369	Possible values are:</entry>	2369	Possible values are:</entry>