From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Oct 2008 23:07:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds
X-Git-Tag: v2.6.28-rc1~6
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ea541686d8454efac4f2b5c0767affb12d4b6a52;hp=-c;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
  leds/acpi: Fix merge fallout from acpi_driver_data change
  leds: Simplify logic in leds-ams-delta
  leds: Fix trigger registration race
  leds: Fix leds-class.c comment
  leds: Add driver for HP harddisk protection LEDs
  leds: leds-pca955x - Mark pca955x_led_set() static
  leds: Remove uneeded leds-cm-x270 driver
  leds: Remove uneeded strlen calls
  leds: Add leds-wrap default-trigger
  leds: Make default trigger fields const
  leds: Add backlight LED trigger
  leds: da903x: Add support for LEDs found on DA9030/DA9034
---

ea541686d8454efac4f2b5c0767affb12d4b6a52
diff --combined drivers/leds/Kconfig
index c7ff1e11ea8,33ff1cbeebd..e7fb7d2fcbf
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@@ -113,11 -113,12 +113,12 @@@ config LEDS_GPI
  	  outputs. To be useful the particular board must have LEDs
  	  and they must be connected to the GPIO lines.
  
- config LEDS_CM_X270
- 	tristate "LED Support for the CM-X270 LEDs"
- 	depends on LEDS_CLASS && MACH_ARMCORE
+ config LEDS_HP_DISK
+ 	tristate "LED Support for disk protection LED on HP notebooks"
+ 	depends on LEDS_CLASS && ACPI
  	help
- 	  This option enables support for the CM-X270 LEDs.
+ 	  This option enable support for disk protection LED, found on
+ 	  newer HP notebooks.
  
  config LEDS_CLEVO_MAIL
  	tristate "Mail LED on Clevo notebook (EXPERIMENTAL)"
@@@ -157,6 -158,13 +158,13 @@@ config LEDS_PCA955
  	  LED driver chips accessed via the I2C bus.  Supported
  	  devices include PCA9550, PCA9551, PCA9552, and PCA9553.
  
+ config LEDS_DA903X
+ 	tristate "LED Support for DA9030/DA9034 PMIC"
+ 	depends on LEDS_CLASS && PMIC_DA903X
+ 	help
+ 	  This option enables support for on-chip LED drivers found
+ 	  on Dialog Semiconductor DA9030/DA9034 PMICs.
+ 
  comment "LED Triggers"
  
  config LEDS_TRIGGERS
@@@ -179,7 -187,7 +187,7 @@@ config LEDS_TRIGGER_TIME
  
  config LEDS_TRIGGER_IDE_DISK
  	bool "LED IDE Disk Trigger"
 -	depends on LEDS_TRIGGERS && BLK_DEV_IDEDISK
 +	depends on LEDS_TRIGGERS && IDE_GD_ATA
  	help
  	  This allows LEDs to be controlled by IDE disk activity.
  	  If unsure, say Y.
@@@ -193,6 -201,15 +201,15 @@@ config LEDS_TRIGGER_HEARTBEA
  	  load average.
  	  If unsure, say Y.
  
+ config LEDS_TRIGGER_BACKLIGHT
+ 	tristate "LED backlight Trigger"
+ 	depends on LEDS_TRIGGERS
+ 	help
+ 	  This allows LEDs to be controlled as a backlight device: they
+ 	  turn off and on when the display is blanked and unblanked.
+ 
+ 	  If unsure, say N.
+ 
  config LEDS_TRIGGER_DEFAULT_ON
  	tristate "LED Default ON Trigger"
  	depends on LEDS_TRIGGERS