Merge branches 'release', 'button-sysfs', 'misc', 'mismatch', 'randconfig' and 'toshiba' into release
This commit is contained in:
@@ -765,7 +765,7 @@ static struct led_classdev mail_led = {
|
||||
.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);
|
||||
}
|
||||
@@ -798,7 +798,7 @@ static struct backlight_ops acer_bl_ops = {
|
||||
.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;
|
||||
|
||||
@@ -817,7 +817,7 @@ static int __init acer_backlight_init(struct device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __exit acer_backlight_exit(void)
|
||||
static void acer_backlight_exit(void)
|
||||
{
|
||||
backlight_device_unregister(acer_backlight_device);
|
||||
}
|
||||
|
Reference in New Issue
Block a user