Commit 8b3f6af8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/cpc-usb/TODO
	drivers/staging/cpc-usb/cpc-usb_drv.c
	drivers/staging/cpc-usb/cpc.h
	drivers/staging/cpc-usb/cpc_int.h
	drivers/staging/cpc-usb/cpcusb.h
parents 139d6065 94e0fb08

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -2800,7 +2800,7 @@ D: Starter of Linux1394 effort 
S: ask per mail for current address



N: Nicolas Pitre

E: nico@cam.org

E: nico@fluxnic.net

D: StrongARM SA1100 support integrator & hacker

D: Xscale PXA architecture

D: unified SMC 91C9x/91C11x ethernet driver (smc91x)

Documentation/ABI/stable/sysfs-class-backlight

0 → 100644
+36 −0
Original line number Diff line number Diff line 
What:		/sys/class/backlight/<backlight>/bl_power

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Control BACKLIGHT power, values are FB_BLANK_* from fb.h

		 - FB_BLANK_UNBLANK (0)   : power on.

		 - FB_BLANK_POWERDOWN (4) : power off

Users:		HAL



What:		/sys/class/backlight/<backlight>/brightness

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Control the brightness for this <backlight>. Values

		are between 0 and max_brightness. This file will also

		show the brightness level stored in the driver, which

		may not be the actual brightness (see actual_brightness).

Users:		HAL



What:		/sys/class/backlight/<backlight>/actual_brightness

Date:		March 2006

KernelVersion:	2.6.17

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Show the actual brightness by querying the hardware.

Users:		HAL



What:		/sys/class/backlight/<backlight>/max_brightness

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Maximum brightness for <backlight>.

Users:		HAL

Documentation/ABI/testing/sysfs-bus-pci

+10 −0
Original line number Diff line number Diff line
@@ -84,6 +84,16 @@ Description: 
		from this part of the device tree.

		Depends on CONFIG_HOTPLUG.



What:		/sys/bus/pci/devices/.../reset

Date:		July 2009

Contact:	Michael S. Tsirkin <mst@redhat.com>

Description:

		Some devices allow an individual function to be reset

		without affecting other functions in the same device.

		For devices that have this support, a file named reset

		will be present in sysfs.  Writing 1 to this file

		will perform reset.



What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

Documentation/ABI/testing/sysfs-class-lcd

0 → 100644
+23 −0
Original line number Diff line number Diff line 
What:		/sys/class/lcd/<lcd>/lcd_power

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Control LCD power, values are FB_BLANK_* from fb.h

		 - FB_BLANK_UNBLANK (0)   : power on.

		 - FB_BLANK_POWERDOWN (4) : power off



What:		/sys/class/lcd/<lcd>/contrast

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Current contrast of this LCD device. Value is between 0 and

		/sys/class/lcd/<lcd>/max_contrast.



What:		/sys/class/lcd/<lcd>/max_contrast

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Maximum contrast for this LCD device.

Documentation/ABI/testing/sysfs-class-led

0 → 100644
+28 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/<led>/brightness

Date:		March 2006

KernelVersion:	2.6.17

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Set the brightness of the LED. Most LEDs don't

		have hardware brightness support so will just be turned on for

		non-zero brightness settings. The value is between 0 and

		/sys/class/leds/<led>/max_brightness.



What:		/sys/class/leds/<led>/max_brightness

Date:		March 2006

KernelVersion:	2.6.17

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Maximum brightness level for this led, default is 255 (LED_FULL).



What:		/sys/class/leds/<led>/trigger

Date:		March 2006

KernelVersion:	2.6.17

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Set the trigger for this LED. A trigger is a kernel based source

		of led events.

		You can change triggers in a similar manner to the way an IO

		scheduler is chosen. Trigger specific parameters can appear in

		/sys/class/leds/<led> once a given trigger is selected.