Merge branches 'release', 'button-sysfs', 'misc', 'mismatch', 'randconfig' and 'toshi...

[sfrench/cifs-2.6.git] / drivers / misc / acer-wmi.c

diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index 74d12b4a3abdae48be072857ec75a34c90496dcb..cf71e312b5cb05f45f3eb2165400a922591542a2 100644 (file)
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -765,7 +765,7 @@ static struct led_classdev mail_led = {
        .brightness_set = mail_led_set,
 };
 
        .brightness_set = mail_led_set,
 };
 

-static int __init acer_led_init(struct device *dev)
+static int __devinit acer_led_init(struct device *dev)

 {
        return led_classdev_register(dev, &mail_led);
 }
 {
        return led_classdev_register(dev, &mail_led);
 }


@@ -798,7 +798,7 @@ static struct backlight_ops acer_bl_ops = {
        .update_status = update_bl_status,
 };
 
        .update_status = update_bl_status,
 };
 

-static int __init acer_backlight_init(struct device *dev)
+static int __devinit acer_backlight_init(struct device *dev)

 {
        struct backlight_device *bd;
 
 {
        struct backlight_device *bd;
 


@@ -817,7 +817,7 @@ static int __init acer_backlight_init(struct device *dev)
        return 0;
 }
 
        return 0;
 }
 

-static void __exit acer_backlight_exit(void)
+static void acer_backlight_exit(void)

 {
        backlight_device_unregister(acer_backlight_device);
 }
 {
        backlight_device_unregister(acer_backlight_device);
 }