From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/leds/Kconfig | 15 --------------- drivers/leds/Makefile | 5 ----- 2 files changed, 20 deletions(-) diff -puN drivers/leds/Kconfig~git-leds-fixup drivers/leds/Kconfig --- a/drivers/leds/Kconfig~git-leds-fixup +++ a/drivers/leds/Kconfig @@ -82,20 +82,6 @@ config LEDS_WRAP help This option enables support for the PCEngines WRAP programmable LEDs. -<<<<<<< HEAD/drivers/leds/Kconfig -config LEDS_H1940 - tristate "LED Support for iPAQ H1940 device" - depends LEDS_CLASS && ARCH_H1940 - help - This option enables support for the LEDs on the h1940. - -config LEDS_COBALT - tristate "LED Support for Cobalt Server front LED" - depends on LEDS_CLASS && MIPS_COBALT - help - This option enables support for the front LED on Cobalt Server - -======= config LEDS_H1940 tristate "LED Support for iPAQ H1940 device" depends LEDS_CLASS && ARCH_H1940 @@ -116,7 +102,6 @@ config LEDS_GPIO outputs. To be useful the particular board must have LEDs and they must be connected to the GPIO lines. ->>>>>>> /drivers/leds/Kconfig comment "LED Triggers" config LEDS_TRIGGERS diff -puN drivers/leds/Makefile~git-leds-fixup drivers/leds/Makefile --- a/drivers/leds/Makefile~git-leds-fixup +++ a/drivers/leds/Makefile @@ -14,14 +14,9 @@ obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c2 obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o -<<<<<<< HEAD/drivers/leds/Makefile -obj-$(CONFIG_LEDS_H1940) += leds-h1940.o -obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o -======= obj-$(CONFIG_LEDS_H1940) += leds-h1940.o obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o ->>>>>>> /drivers/leds/Makefile # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o _