7 files changed, 15 insertions, 15 deletions

diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
index d2beaeee87..c132be5f69 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c
@@ -328,17 +328,17 @@ static void led_control_service(void)
 }
 #endif /* BOOTLOADER */
 
-void __button_backlight_on(void)
+void __buttonlight_on(void)
 {
     buttonlight_control = BUTTONLIGHT_CONTROL_ON;
 }
 
-void __button_backlight_off(void)
+void __buttonlight_off(void)
 {
     buttonlight_control = BUTTONLIGHT_CONTROL_OFF;
 }
 
-void __button_backlight_dim(bool dim_now)
+void __buttonlight_dim(bool dim_now)
 {
     buttonlight_control = BUTTONLIGHT_CONTROL_IDLE;
     buttonlight_target = (dim_now == true) ? 0 : buttonlight_brightness;
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
index c51d8f20f0..0589557791 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-target.h
@@ -48,11 +48,11 @@ void __backlight_set_brightness(int brightness);
 
 void __buttonlight_set_brightness(int brightness);
 
-void __button_backlight_on(void);
-void __button_backlight_off(void);
+void __buttonlight_on(void);
+void __buttonlight_off(void);
 
 /* true: backlight fades off - false: backlight fades on */
 void __backlight_dim(bool dim);
-void __button_backlight_dim(bool dim_now);
+void __buttonlight_dim(bool dim_now);
 
 #endif
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
index 5655d92ef8..4a818d6bfc 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
@@ -82,7 +82,7 @@ int button_read_device(void)
         /* if the buttons dont agree twice in a row, then its none */
         lastbutton = btn;
         btn = BUTTON_NONE;
-        button_backlight_on();
+        buttonlight_on();
     }
 
     /* Check for hold first - exit if asserted with no button pressed */
@@ -107,7 +107,7 @@ int button_read_device(void)
 
         if (buttons & (1 << 4))
             btn |= BUTTON_A;
-        button_backlight_on();
+        buttonlight_on();
     }
     
     /* the touchpad */
@@ -128,7 +128,7 @@ int button_read_device(void)
 
         if (touchpad & (1 << 3))
             btn |= BUTTON_SELECT;
-        button_backlight_on();
+        buttonlight_on();
     }
     
     return btn;
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
index 7921e0ccd4..ac37908b05 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
@@ -64,7 +64,7 @@ void power_off(void)
 {
     /* turn off backlight and wait for 1 second */
     __backlight_off();
-    __button_backlight_off();
+    __buttonlight_off();
     sleep(HZ);
     /* set SLEEP bit to on in CLKCON to turn off */
     CLKCON |=(1<<3);
diff --git a/firmware/target/arm/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c
index 0dd4a2122b..f7835e1bd9 100644
--- a/firmware/target/arm/sandisk/backlight-c200_e200.c
+++ b/firmware/target/arm/sandisk/backlight-c200_e200.c
@@ -51,7 +51,7 @@ void __backlight_off(void)
 }
 
 #ifdef HAVE_BUTTON_LIGHT
-void __button_backlight_on(void)
+void __buttonlight_on(void)
 {
     GPIOG_OUTPUT_VAL |= 0x80;
 #ifdef SANSA_C200
@@ -59,7 +59,7 @@ void __button_backlight_on(void)
 #endif
 }
 
-void __button_backlight_off(void)
+void __buttonlight_off(void)
 {
     GPIOG_OUTPUT_VAL &=~ 0x80;
 #ifdef SANSA_C200
diff --git a/firmware/target/arm/sandisk/backlight-target.h b/firmware/target/arm/sandisk/backlight-target.h
index 1b1a6ad4e1..53a87fbbb3 100644
--- a/firmware/target/arm/sandisk/backlight-target.h
+++ b/firmware/target/arm/sandisk/backlight-target.h
@@ -26,7 +26,7 @@ void __backlight_set_brightness(int brightness);
 int  __backlight_is_on(void);
 
 #ifdef HAVE_BUTTON_LIGHT
-void __button_backlight_on(void);
-void __button_backlight_off(void);
+void __buttonlight_on(void);
+void __buttonlight_off(void);
 #endif
 #endif
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
index f6a01c863c..5988e165a7 100644
--- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c
@@ -196,7 +196,7 @@ void clickwheel_int(void)
                    than every 1/4 second*/
                 next_backlight_on = current_tick + HZ/4;
                 backlight_on();
-                button_backlight_on();
+                buttonlight_on();
                 reset_poweroff_timer();
             }