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

Commit e049d1ca authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'linux-2.6' into for-2.6.22

parents edfac96a 80584ff3

Documentation/ABI/obsolete/dv1394

0 → 100644
+9 −0
Original line number Diff line number Diff line 
What:		dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)

Contact:	linux1394-devel@lists.sourceforge.net

Description:

	New application development should use raw1394 + userspace libraries

	instead, notably libiec61883 which is functionally equivalent.



Users:

	ffmpeg/libavformat (used by a variety of media players)

	dvgrab v1.x (replaced by dvgrab2 on top of raw1394 and resp. libraries)

Documentation/cpusets.txt

+3 −0
Original line number Diff line number Diff line
@@ -557,6 +557,9 @@ Set some flags: 
Add some cpus:

# /bin/echo 0-7 > cpus



Add some mems:

# /bin/echo 0-7 > mems



Now attach your shell to this cpuset:

# /bin/echo $$ > tasks

Documentation/crypto/api-intro.txt

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ Here's an example of how to use the API: 
	desc.tfm = tfm;

	desc.flags = 0;

	

	if (crypto_hash_digest(&desc, &sg, 2, result))

	if (crypto_hash_digest(&desc, sg, 2, result))

		fail();

	

	crypto_free_hash(tfm);

Documentation/feature-removal-schedule.txt

+8 −11
Original line number Diff line number Diff line
@@ -39,17 +39,6 @@ Who: Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de> 


---------------------------



What:	dv1394 driver (CONFIG_IEEE1394_DV1394)

When:	June 2007

Why:	Replaced by raw1394 + userspace libraries, notably libiec61883.  This

	shift of application support has been indicated on www.linux1394.org

	and developers' mailinglists for quite some time.  Major applications

	have been converted, with the exception of ffmpeg and hence xine.

	Piped output of dvgrab2 is a partial equivalent to dv1394.

Who:	Dan Dennedy <dan@dennedy.org>, Stefan Richter <stefanr@s5r6.in-berlin.de>



---------------------------



What:	Video4Linux API 1 ioctls and video_decoder.h from Video devices.

When:	December 2006

Why:	V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
@@ -316,3 +305,11 @@ Why: The option/code is 
Who:	Johannes Berg <johannes@sipsolutions.net>



---------------------------



What:	i8xx_tco watchdog driver

When:	in 2.6.22

Why:	the i8xx_tco watchdog driver has been replaced by the iTCO_wdt

	watchdog driver.

Who:	Wim Van Sebroeck <wim@iguana.be>



---------------------------

Documentation/gpio.txt

+4 −1
Original line number Diff line number Diff line
@@ -105,12 +105,15 @@ setting up a platform_device using the GPIO, is mark its direction: 


	/* set as input or output, returning 0 or negative errno */

	int gpio_direction_input(unsigned gpio);

	int gpio_direction_output(unsigned gpio);

	int gpio_direction_output(unsigned gpio, int value);



The return value is zero for success, else a negative errno.  It should

be checked, since the get/set calls don't have error returns and since

misconfiguration is possible.  (These calls could sleep.)



For output GPIOs, the value provided becomes the initial output value.

This helps avoid signal glitching during system startup.



Setting the direction can fail if the GPIO number is invalid, or when

that particular GPIO can't be used in that mode.  It's generally a bad

idea to rely on boot firmware to have set the direction correctly, since