summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/ibm_acpi.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-12-20 02:52:17 -0500
committerLen Brown <len.brown@intel.com>2006-12-20 02:52:17 -0500
commit40b20c257a13c5a526ac540bc5e43d0fdf29792a (patch)
treee125c0c2b557e36cb0c3a2c3726fadbcdae0dca3 /drivers/acpi/ibm_acpi.c
parentcece901481bafbf14de8cbd3a89ae869ea881055 (diff)
parenta8274d57afb83e4954ddcb3f8b7dd1c03a379bd4 (diff)
Pull platform-drivers into test branch
Diffstat (limited to 'drivers/acpi/ibm_acpi.c')
-rw-r--r--drivers/acpi/ibm_acpi.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 1e7abef404b..130cc8c37e2 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -1714,7 +1714,7 @@ static struct backlight_properties ibm_backlight_data = {
static int brightness_init(void)
{
- ibm_backlight_device = backlight_device_register("ibm", NULL,
+ ibm_backlight_device = backlight_device_register("ibm", NULL, NULL,
&ibm_backlight_data);
if (IS_ERR(ibm_backlight_device)) {
printk(IBM_ERR "Could not register backlight device\n");
@@ -2503,7 +2503,7 @@ static int __init setup_notify(struct ibm_struct *ibm)
ibm->name, status);
return -ENODEV;
}
-
+ ibm->notify_installed = 1;
return 0;
}
@@ -2580,7 +2580,6 @@ static int __init ibm_init(struct ibm_struct *ibm)
ret = setup_notify(ibm);
if (ret < 0)
return ret;
- ibm->notify_installed = 1;
}
return 0;