Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d30cc16c authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'fixes-modulesplit' into fixes

parents 41eb2d81 a1bcc1dc

Documentation/ABI/testing/sysfs-bus-pci-devices-cciss

+7 −0
Original line number Original line Diff line number Diff line
@@ -71,3 +71,10 @@ Description: Value of 1 indicates the controller can honor the reset_devices 
		a dump device, as kdump requires resetting the device in order

		a dump device, as kdump requires resetting the device in order

		to work reliably.

		to work reliably.





Where:		/sys/bus/pci/devices/<dev>/ccissX/transport_mode

Date:		July 2011

Kernel Version:	3.0

Contact:	iss_storagedev@hp.com

Description:	Value of "simple" indicates that the controller has been placed

		in "simple mode". Value of "performant" indicates that the

		controller has been placed in "performant mode".

Documentation/CodingStyle

+2 −2
Original line number Original line Diff line number Diff line
@@ -166,8 +166,8 @@ if (condition) 
else

else

	do_that();

	do_that();





This does not apply if one branch of a conditional statement is a single

This does not apply if only one branch of a conditional statement is a single

statement. Use braces in both branches.

statement; in the latter case use braces in both branches:





if (condition) {

if (condition) {

	do_this();

	do_this();

Documentation/DMA-API.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,13 @@ specify the GFP_ flags (see kmalloc) for the allocation (the 
implementation may choose to ignore flags that affect the location of

implementation may choose to ignore flags that affect the location of

the returned memory, like GFP_DMA).

the returned memory, like GFP_DMA).





void *

dma_zalloc_coherent(struct device *dev, size_t size,

			     dma_addr_t *dma_handle, gfp_t flag)



Wraps dma_alloc_coherent() and also zeroes the returned memory if the

allocation attempt succeeded.



void

void

dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,

dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,

			   dma_addr_t dma_handle)

			   dma_addr_t dma_handle)

Documentation/DocBook/media/v4l/compat.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -2486,6 +2486,9 @@ ioctls.</para> 
        <listitem>

        <listitem>

	  <para>Flash API. <xref linkend="flash-controls" /></para>

	  <para>Flash API. <xref linkend="flash-controls" /></para>

        </listitem>

        </listitem>

        <listitem>

	  <para>&VIDIOC-CREATE-BUFS; and &VIDIOC-PREPARE-BUF; ioctls.</para>

        </listitem>

      </itemizedlist>

      </itemizedlist>

    </section>

    </section>

Documentation/DocBook/media/v4l/controls.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -232,8 +232,9 @@ control is deprecated. New drivers and applications should use the 
	    <entry>Enables a power line frequency filter to avoid

	    <entry>Enables a power line frequency filter to avoid

flicker. Possible values for <constant>enum v4l2_power_line_frequency</constant> are:

flicker. Possible values for <constant>enum v4l2_power_line_frequency</constant> are:

<constant>V4L2_CID_POWER_LINE_FREQUENCY_DISABLED</constant> (0),

<constant>V4L2_CID_POWER_LINE_FREQUENCY_DISABLED</constant> (0),

<constant>V4L2_CID_POWER_LINE_FREQUENCY_50HZ</constant> (1) and

<constant>V4L2_CID_POWER_LINE_FREQUENCY_50HZ</constant> (1),

<constant>V4L2_CID_POWER_LINE_FREQUENCY_60HZ</constant> (2).</entry>

<constant>V4L2_CID_POWER_LINE_FREQUENCY_60HZ</constant> (2) and

<constant>V4L2_CID_POWER_LINE_FREQUENCY_AUTO</constant> (3).</entry>

	  </row>

	  </row>

	  <row>

	  <row>

	    <entry><constant>V4L2_CID_HUE_AUTO</constant></entry>

	    <entry><constant>V4L2_CID_HUE_AUTO</constant></entry>