aboutsummaryrefslogtreecommitdiffstats
diff options
-rw-r--r--led_classdev.sysfs-name.patch72
-rw-r--r--series1
-rw-r--r--version2
3 files changed, 74 insertions, 1 deletions
diff --git a/led_classdev.sysfs-name.patch b/led_classdev.sysfs-name.patch
new file mode 100644
index 00000000000000..40e638145d7d6d
--- /dev/null
+++ b/led_classdev.sysfs-name.patch
@@ -0,0 +1,72 @@
+From: Olaf Hering <olh@suse.de>
+Subject: LED: use correct name for /sys/devices/virtual/leds/ entries
+
+From: Olaf Hering <olh@suse.de>
+
+This is needed to get kde-powersave to work properly on some g4
+powerbooks.
+
+From: Olaf Hering <olh@suse.de>
+Cc: Richard Purdie <rpurdie@rpsys.net>,
+Cc: Guennadi Liakhovetski <lg@denx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/leds/leds-cobalt-qube.c | 2 +-
+ drivers/leds/leds-cobalt-raq.c | 4 ++--
+ drivers/leds/ledtrig-default-on.c | 2 +-
+ drivers/macintosh/via-pmu-led.c | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/drivers/leds/leds-cobalt-qube.c
++++ b/drivers/leds/leds-cobalt-qube.c
+@@ -28,7 +28,7 @@ static void qube_front_led_set(struct le
+ }
+
+ static struct led_classdev qube_front_led = {
+- .name = "qube-front",
++ .name = "qube::front",
+ .brightness = LED_FULL,
+ .brightness_set = qube_front_led_set,
+ .default_trigger = "ide-disk",
+--- a/drivers/leds/leds-cobalt-raq.c
++++ b/drivers/leds/leds-cobalt-raq.c
+@@ -49,7 +49,7 @@ static void raq_web_led_set(struct led_c
+ }
+
+ static struct led_classdev raq_web_led = {
+- .name = "raq-web",
++ .name = "raq::web",
+ .brightness_set = raq_web_led_set,
+ };
+
+@@ -70,7 +70,7 @@ static void raq_power_off_led_set(struct
+ }
+
+ static struct led_classdev raq_power_off_led = {
+- .name = "raq-power-off",
++ .name = "raq::power-off",
+ .brightness_set = raq_power_off_led_set,
+ .default_trigger = "power-off",
+ };
+--- a/drivers/leds/ledtrig-default-on.c
++++ b/drivers/leds/ledtrig-default-on.c
+@@ -23,7 +23,7 @@ static void defon_trig_activate(struct l
+ }
+
+ static struct led_trigger defon_led_trigger = {
+- .name = "default-on",
++ .name = "default::on",
+ .activate = defon_trig_activate,
+ };
+
+--- a/drivers/macintosh/via-pmu-led.c
++++ b/drivers/macintosh/via-pmu-led.c
+@@ -72,7 +72,7 @@ static void pmu_led_set(struct led_class
+ }
+
+ static struct led_classdev pmu_led = {
+- .name = "pmu-front-led",
++ .name = "pmu-led::front",
+ #ifdef CONFIG_ADB_PMU_LED_IDE
+ .default_trigger = "ide-disk",
+ #endif
diff --git a/series b/series
index 32317fa4d21b9e..9ee2ffbf55f67e 100644
--- a/series
+++ b/series
@@ -80,3 +80,4 @@ staging/staging-android-binder-clean-up-for-all-the-stat-statments.patch
staging/staging-wlan-ng-scripts-checkpatch.pl-error-fixes.patch
staging/staging-et1310-fix-the-coding-style.patch
+led_classdev.sysfs-name.patch
diff --git a/version b/version
index 127932274a6370..051e785cda6355 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.30-git22
+2.6.31-rc1