Merge branch 'for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge (3983138c) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/ABI/testing/debugfs-ideapad

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		What: /sys/kernel/debug/ideapad/cfg
		Date: Sep 2011
		KernelVersion: 3.2
		Contact: Ike Panhc <ike.pan@canonical.com>
		Description:

		cfg shows the return value of _CFG method in VPC2004 device. It tells machine
		capability and what graphic component within the machine.


		What: /sys/kernel/debug/ideapad/status
		Date: Sep 2011
		KernelVersion: 3.2
		Contact: Ike Panhc <ike.pan@canonical.com>
		Description:

		status shows infos we can read and tells its meaning and value.

Documentation/ABI/testing/sysfs-platform-ideapad-laptop

+0 −15

Original line number	Diff line number	Diff line
		@@ -5,19 +5,4 @@ Contact: "Ike Panhc <ike.pan@canonical.com>"
		Description:
		Control the power of camera module. 1 means on, 0 means off.

		What: /sys/devices/platform/ideapad/cfg
		Date: Jun 2011
		KernelVersion: 3.1
		Contact: "Ike Panhc <ike.pan@canonical.com>"
		Description:
		Ideapad capability bits.
		Bit 8-10: 1 - Intel graphic only
		2 - ATI graphic only
		3 - Nvidia graphic only
		4 - Intel and ATI graphic
		5 - Intel and Nvidia graphic
		Bit 16: Bluetooth exist (1 for exist)
		Bit 17: 3G exist (1 for exist)
		Bit 18: Wifi exist (1 for exist)
		Bit 19: Camera exist (1 for exist)

Documentation/DocBook/media/dvb/dvbproperty.xml

+10 −14

Original line number	Diff line number	Diff line
		@@ -352,6 +352,7 @@ typedef enum fe_delivery_system {
		SYS_CMMB,
		SYS_DAB,
		SYS_DVBT2,
		SYS_TURBO,
		} fe_delivery_system_t;
		</programlisting>
		</section>
		@@ -809,6 +810,8 @@ typedef enum fe_hierarchy {
		<listitem><para><link linkend="DTV-INVERSION"><constant>DTV_INVERSION</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-SYMBOL-RATE"><constant>DTV_SYMBOL_RATE</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-INNER-FEC"><constant>DTV_INNER_FEC</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-VOLTAGE"><constant>DTV_VOLTAGE</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-TONE"><constant>DTV_TONE</constant></link></para></listitem>
		</itemizedlist>
		<para>Future implementations might add those two missing parameters:</para>
		<itemizedlist mark='opencircle'>
		@@ -818,25 +821,18 @@ typedef enum fe_hierarchy {
		</section>
		<section id="dvbs2-params">
		<title>DVB-S2 delivery system</title>
		<para>The following parameters are valid for DVB-S2:</para>
		<para>In addition to all parameters valid for DVB-S, DVB-S2 supports the following parameters:</para>
		<itemizedlist mark='opencircle'>
		<listitem><para><link linkend="DTV-API-VERSION"><constant>DTV_API_VERSION</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-DELIVERY-SYSTEM"><constant>DTV_DELIVERY_SYSTEM</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-TUNE"><constant>DTV_TUNE</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-CLEAR"><constant>DTV_CLEAR</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-FREQUENCY"><constant>DTV_FREQUENCY</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-INVERSION"><constant>DTV_INVERSION</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-SYMBOL-RATE"><constant>DTV_SYMBOL_RATE</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-INNER-FEC"><constant>DTV_INNER_FEC</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-VOLTAGE"><constant>DTV_VOLTAGE</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-TONE"><constant>DTV_TONE</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-MODULATION"><constant>DTV_MODULATION</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-PILOT"><constant>DTV_PILOT</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-ROLLOFF"><constant>DTV_ROLLOFF</constant></link></para></listitem>
		</itemizedlist>
		<para>Future implementations might add those two missing parameters:</para>
		</section>
		<section id="turbo-params">
		<title>Turbo code delivery system</title>
		<para>In addition to all parameters valid for DVB-S, turbo code supports the following parameters:</para>
		<itemizedlist mark='opencircle'>
		<listitem><para><link linkend="DTV-DISEQC-MASTER"><constant>DTV_DISEQC_MASTER</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-DISEQC-SLAVE-REPLY"><constant>DTV_DISEQC_SLAVE_REPLY</constant></link></para></listitem>
		<listitem><para><link linkend="DTV-MODULATION"><constant>DTV_MODULATION</constant></link></para></listitem>
		</itemizedlist>
		</section>
		<section id="isdbs-params">

Documentation/DocBook/media/dvb/intro.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ a partial path like:</para>
		additional include file <emphasis
		role="tt">linux/dvb/version.h</emphasis> exists, which defines the
		constant <emphasis role="tt">DVB_API_VERSION</emphasis>. This document
		describes <emphasis role="tt">DVB_API_VERSION 3</emphasis>.
		describes <emphasis role="tt">DVB_API_VERSION 5.4</emphasis>.
		</para>

		</section>

Documentation/DocBook/media/v4l/compat.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -2370,6 +2370,14 @@ that used it. It was originally scheduled for removal in 2.6.35.
		</listitem>
		</orderedlist>
		</section>
		<section>
		<title>V4L2 in Linux 3.2</title>
		<orderedlist>
		<listitem>
		<para>V4L2_CTRL_FLAG_VOLATILE was added to signal volatile controls to userspace.</para>
		</listitem>
		</orderedlist>
		</section>

		<section id="other">
		<title>Relation of V4L2 to other Linux multimedia APIs</title>