diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-09-20 12:00:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-09-20 12:01:01 +0200 |
commit | 40a0c68ca9b49fb3e7292c1bae035ba5bcb27903 (patch) | |
tree | 11682834d3442d4640c4464709a76a268869ffbd /drivers/leds/leds-clevo-mail.c | |
parent | c61037e905a5cb74c7d786c35ee2cdbab9ed63af (diff) | |
parent | 7e3115ef5149fc502e3a2e80719dba54a8e7409d (diff) |
Merge branch 'sched/urgent' into sched/core
Merge in the latest fixes before applying a dependent patch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/leds/leds-clevo-mail.c')
-rw-r--r-- | drivers/leds/leds-clevo-mail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c index 6a8405df76a..d93e2455da5 100644 --- a/drivers/leds/leds-clevo-mail.c +++ b/drivers/leds/leds-clevo-mail.c @@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id) * detected as working, but in reality it is not) as low as * possible. */ -static struct dmi_system_id __initdata clevo_mail_led_dmi_table[] = { +static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = { { .callback = clevo_mail_led_dmi_callback, .ident = "Clevo D410J", |