GIT 8d4b4b0eaba432d4112ca3baee031d9437218e09 git://git.o-hand.com/linux-rpurdie-leds#for-mm commit 8d4b4b0eaba432d4112ca3baee031d9437218e09 Author: Yoichi Yuasa Date: Fri Sep 21 00:02:47 2007 +0100 leds: Rename leds-cobalt driver The leds-cobalt driver only supports the Coable Qube series (not included in Cobalt Raq series). Rename the driver and update Kconfig/Makefile. Signed-off-by: Yoichi Yuasa Acked-by: Florian Fainelli Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton --- drivers/leds/Kconfig | 6 ++-- drivers/leds/Makefile | 2 - drivers/leds/leds-cobalt-qube.c | 43 ++++++++++++++++++++++++++++++ drivers/leds/leds-cobalt.c | 43 ------------------------------ 4 files changed, 47 insertions(+), 47 deletions(-) diff -puN drivers/leds/Kconfig~git-leds drivers/leds/Kconfig --- a/drivers/leds/Kconfig~git-leds +++ a/drivers/leds/Kconfig @@ -87,11 +87,11 @@ config LEDS_H1940 help This option enables support for the LEDs on the h1940. -config LEDS_COBALT - tristate "LED Support for Cobalt Server front LED" +config LEDS_COBALT_QUBE + tristate "LED Support for the Cobalt Qube series front LED" depends on LEDS_CLASS && MIPS_COBALT help - This option enables support for the front LED on Cobalt Server + This option enables support for the front LED on Cobalt Qube series config LEDS_GPIO tristate "LED Support for GPIO connected LEDs" diff -puN drivers/leds/Makefile~git-leds drivers/leds/Makefile --- a/drivers/leds/Makefile~git-leds +++ a/drivers/leds/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_LEDS_AMS_DELTA) += leds-am obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o obj-$(CONFIG_LEDS_H1940) += leds-h1940.o -obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o +obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o diff -puN /dev/null drivers/leds/leds-cobalt-qube.c --- /dev/null +++ a/drivers/leds/leds-cobalt-qube.c @@ -0,0 +1,43 @@ +/* + * Copyright 2006 - Florian Fainelli + * + * Control the Cobalt Qube/RaQ front LED + */ + +#include +#include +#include +#include +#include +#include + +static void cobalt_led_set(struct led_classdev *led_cdev, enum led_brightness brightness) +{ + if (brightness) + COBALT_LED_PORT = COBALT_LED_BAR_LEFT | COBALT_LED_BAR_RIGHT; + else + COBALT_LED_PORT = 0; +} + +static struct led_classdev cobalt_led = { + .name = "cobalt-front-led", + .brightness_set = cobalt_led_set, + .default_trigger = "ide-disk", +}; + +static int __init cobalt_led_init(void) +{ + return led_classdev_register(NULL, &cobalt_led); +} + +static void __exit cobalt_led_exit(void) +{ + led_classdev_unregister(&cobalt_led); +} + +module_init(cobalt_led_init); +module_exit(cobalt_led_exit); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Front LED support for Cobalt Server"); +MODULE_AUTHOR("Florian Fainelli "); diff -puN drivers/leds/leds-cobalt.c~git-leds /dev/null --- a/drivers/leds/leds-cobalt.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2006 - Florian Fainelli - * - * Control the Cobalt Qube/RaQ front LED - */ - -#include -#include -#include -#include -#include -#include - -static void cobalt_led_set(struct led_classdev *led_cdev, enum led_brightness brightness) -{ - if (brightness) - COBALT_LED_PORT = COBALT_LED_BAR_LEFT | COBALT_LED_BAR_RIGHT; - else - COBALT_LED_PORT = 0; -} - -static struct led_classdev cobalt_led = { - .name = "cobalt-front-led", - .brightness_set = cobalt_led_set, - .default_trigger = "ide-disk", -}; - -static int __init cobalt_led_init(void) -{ - return led_classdev_register(NULL, &cobalt_led); -} - -static void __exit cobalt_led_exit(void) -{ - led_classdev_unregister(&cobalt_led); -} - -module_init(cobalt_led_init); -module_exit(cobalt_led_exit); - -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("Front LED support for Cobalt Server"); -MODULE_AUTHOR("Florian Fainelli "); _