[folded] led-driver-for-the-soekris-net5501-board-fix-2.patch removed from -mm tree

[akpm@linux-foundation.org]

The patch titled
     leds: fix net5501 kconfig
has been removed from the -mm tree.  Its filename was
     led-driver-for-the-soekris-net5501-board-fix-2.patch

This patch was dropped because it was folded into led-driver-for-the-soekris-net5501-board.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: leds: fix net5501 kconfig
From: Randy Dunlap <randy.dunlap@oracle.com>

LEDS_NET5501 selects LEDS_TRIGGER_DEFAULT_ON even when the symbol
LEDS_TRIGGERS is not enabled.  This causes build errors, so make
LEDS_NET5501 depend on LEDS_TRIGGERS to prevent the build errors.

drivers/leds/ledtrig-default-on.c:25: error: variable 'defon_led_trigger' has initializer but incomplete type
drivers/leds/ledtrig-default-on.c:26: error: unknown field 'name' specified in initializer
drivers/leds/ledtrig-default-on.c:26: warning: excess elements in struct initializer
drivers/leds/ledtrig-default-on.c:26: warning: (near initialization for 'defon_led_trigger')
drivers/leds/ledtrig-default-on.c:27: error: unknown field 'activate' specified in initializer
drivers/leds/ledtrig-default-on.c:27: warning: excess elements in struct initializer
drivers/leds/ledtrig-default-on.c:27: warning: (near initialization for 'defon_led_trigger')
drivers/leds/ledtrig-default-on.c:32: error: implicit declaration of function 'led_trigger_register'
drivers/leds/ledtrig-default-on.c:37: error: implicit declaration of function 'led_trigger_unregister'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Bjarke Istrup Pedersen <gurligebis@gentoo.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/leds/Kconfig |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/leds/Kconfig~led-driver-for-the-soekris-net5501-board-fix-2 drivers/leds/Kconfig
--- a/drivers/leds/Kconfig~led-driver-for-the-soekris-net5501-board-fix-2
+++ a/drivers/leds/Kconfig
@@ -69,7 +69,8 @@ config LEDS_NET48XX
 
 config LEDS_NET5501
 	tristate "LED Support for Soekris net5501 series Error LED"
-	depends on LEDS_CLASS && LEDS_GPIO_PLATFORM && GPIO_CS5535
+	depends on LEDS_CLASS && LEDS_TRIGGERS
+	depends on LEDS_GPIO_PLATFORM && GPIO_CS5535
 	select LEDS_TRIGGER_DEFAULT_ON
 	default n
 	help
_

Patches currently in -mm which might be from randy.dunlap@oracle.com are

origin.patch
linux-next.patch
dib3000mc-reduce-large-stack-usage.patch
dib7000p-reduce-large-stack-usage.patch
led-driver-for-the-soekris-net5501-board.patch
led-driver-for-the-soekris-net5501-board-fix-2.patch
leds-route-kbd-leds-through-the-generic-leds-layer-leds-input-depends-on-input.patch
scsi-fix-convert-scsi_scanc-kernel-doc.patch
scsi-update-drivers-tools-url-references.patch
laptop-mode-make-flushes-per-device-fix.patch
mmcompaction-add-a-tunable-that-decides-when-memory-should-be-compacted-and-when-it-should-be-reclaimed.patch
lib-hexdumpc-reduce-stack-variable-size-and-cleanups.patch
xen-fix-build-when-sysrq-is-disabled.patch
documentation-submittingdrivers-resources.patch
memcg-move-charge-of-file-pages-fix-2.patch
memcg-update-documentation-v8.patch
numa-update-documentation-vm-numa-add-memoryless-node-info.patch
reiser4-export-remove_from_page_cache-fix.patch
mutex-subsystem-synchro-test-module-add-missing-header-file.patch