Merge tag 'v3.6-rc4'

Merge 3.6-rc4 to get latest OMAP and device tree fixes.

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/leds/ledtrig-gpio.c b/drivers/leds/ledtrig-gpio.c
index f057c101b896..ba215dc42f98 100644
--- a/drivers/leds/ledtrig-gpio.c
+++ b/drivers/leds/ledtrig-gpio.c
@@ -54,12 +54,12 @@ static void gpio_trig_work(struct work_struct *work)
 
         if (tmp) {
                 if (gpio_data->desired_brightness)
-                        led_set_brightness(gpio_data->led,
+                        __led_set_brightness(gpio_data->led,
                                            gpio_data->desired_brightness);
                 else
-                        led_set_brightness(gpio_data->led, LED_FULL);
+                        __led_set_brightness(gpio_data->led, LED_FULL);
         } else {
-                led_set_brightness(gpio_data->led, LED_OFF);
+                __led_set_brightness(gpio_data->led, LED_OFF);
         }
 }