From: Andrew Morton <akpm@linux-foundation.org>

Fix reject in git-leds

Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/leds/Kconfig |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff -puN drivers/leds/Kconfig~git-leds-fixup drivers/leds/Kconfig
--- a/drivers/leds/Kconfig~git-leds-fixup
+++ a/drivers/leds/Kconfig
@@ -1,12 +1,5 @@
-
-<<<<<<< HEAD/drivers/leds/Kconfig
-menu "LED devices"
-	depends on HAS_IOMEM
-
-config NEW_LEDS
-=======
 menuconfig NEW_LEDS
->>>>>>> /drivers/leds/Kconfig
+	depends on HAS_IOMEM
 	bool "LED Support"
 	help
 	  Say Y to enable Linux LED support.  This allows control of supported
_