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

Commit 43d133c1 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'master' into for-2.6.39

parents 4149efb2 6f576d57
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Andy Adamson <andros@citi.umich.edu>
Arnaud Patard <arnaud.patard@rtp-net.org>
Arnd Bergmann <arnd@arndb.de>
Axel Dyks <xl@xlsigned.net>
Axel Lin <axel.lin@gmail.com>
Ben Gardner <bgardner@wabtec.com>
Ben M Cahill <ben.m.cahill@intel.com>
Björn Steinbrink <B.Steinbrink@gmx.de>
+25 −0
Original line number Diff line number Diff line
What:		/sys/devices/platform/at91_can/net/<iface>/mb0_id
Date:		January 2011
KernelVersion:	2.6.38
Contact:	Marc Kleine-Budde <kernel@pengutronix.de>
Description:
		Value representing the can_id of mailbox 0.

		Default: 0x7ff (standard frame)

		Due to a chip bug (errata 50.2.6.3 & 50.3.5.3 in
		"AT91SAM9263 Preliminary 6249H-ATARM-27-Jul-09") the
		contents of mailbox 0 may be send under certain
		conditions (even if disabled or in rx mode).

		The workaround in the errata suggests not to use the
		mailbox and load it with an unused identifier.

		In order to use an extended can_id add the
		CAN_EFF_FLAG (0x80000000U) to the can_id. Example:

		- standard id 0x7ff:
		echo 0x7ff      > /sys/class/net/can0/mb0_id

		- extended id 0x1fffffff:
		echo 0x9fffffff > /sys/class/net/can0/mb0_id
+3 −3
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@
      services.
    </para>
    <para>
      The core of every DRM driver is struct drm_device.  Drivers
      will typically statically initialize a drm_device structure,
      The core of every DRM driver is struct drm_driver.  Drivers
      will typically statically initialize a drm_driver structure,
      then pass it to drm_init() at load time.
    </para>

@@ -84,7 +84,7 @@
    <title>Driver initialization</title>
    <para>
      Before calling the DRM initialization routines, the driver must
      first create and fill out a struct drm_device structure.
      first create and fill out a struct drm_driver structure.
    </para>
    <programlisting>
      static struct drm_driver driver = {
Loading