From 6395d27e5613dfbec0deb2a5340b1864eb7a148b Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Sun, 18 Nov 2012 21:35:55 -0800
Subject: [PATCH] --- yaml --- r: 344473 b: refs/heads/master c:
 057407c732b7761cf417a1e6633a02d9d473340d h: refs/heads/master i:   344471:
 9fddb096f5614bfc90c248a921ac6d32b04ec6cf v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/leds.h | 35 +++++++++++++++++------------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 5b5729940141..a1eac9c68181 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8df7b1ab70bfd6f261fa5e96985fca638299acc
+refs/heads/master: 057407c732b7761cf417a1e6633a02d9d473340d
diff --git a/trunk/include/linux/leds.h b/trunk/include/linux/leds.h
index 8107592cfc41..0d9b5eed714e 100644
--- a/trunk/include/linux/leds.h
+++ b/trunk/include/linux/leds.h
@@ -139,24 +139,6 @@ extern void led_blink_set_oneshot(struct led_classdev *led_cdev,
 extern void led_set_brightness(struct led_classdev *led_cdev,
 			       enum led_brightness brightness);
 
-/**
- * led_trigger_rename_static - rename a trigger
- * @name: the new trigger name
- * @trig: the LED trigger to rename
- *
- * Change a LED trigger name by copying the string passed in
- * name into current trigger name, which MUST be large
- * enough for the new string.
- *
- * Note that name must NOT point to the same string used
- * during LED registration, as that could lead to races.
- *
- * This is meant to be used on triggers with statically
- * allocated name.
- */
-extern void led_trigger_rename_static(const char *name,
-				      struct led_trigger *trig);
-
 /*
  * LED Triggers
  */
@@ -197,6 +179,23 @@ extern void led_trigger_blink_oneshot(struct led_trigger *trigger,
 				      unsigned long *delay_on,
 				      unsigned long *delay_off,
 				      int invert);
+/**
+ * led_trigger_rename_static - rename a trigger
+ * @name: the new trigger name
+ * @trig: the LED trigger to rename
+ *
+ * Change a LED trigger name by copying the string passed in
+ * name into current trigger name, which MUST be large
+ * enough for the new string.
+ *
+ * Note that name must NOT point to the same string used
+ * during LED registration, as that could lead to races.
+ *
+ * This is meant to be used on triggers with statically
+ * allocated name.
+ */
+extern void led_trigger_rename_static(const char *name,
+				      struct led_trigger *trig);
 
 #else