From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andi Kleen <andi@firstfloor•org>, Len Brown <lenb@kernel•org>
Cc: linux-next@vger•kernel.org
Subject: linux-next: manual merge of the acpi tree
Date: Mon, 25 Aug 2008 15:48:00 +1000 [thread overview]
Message-ID: <20080825154800.ff20bc0e.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the acpi tree got a conflict in
drivers/misc/acer-wmi.c between commit
83097aca8567a0bd593534853b71fe0fa9a75d69 ("Fix oops in acer_wmi driver
(acer_wmi_init)") from Linus' tree and commit
017f8ecd1cedb482392f0500ee3701b8c50a46f9 ("Acer-WMI: fingers off
backlight if video.ko is serving this functionality") from the acpi tree.
Just overlapping additions. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/misc/acer-wmi.c
index c6c77a5,6df52e8..0000000
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@@ -1240,8 -1246,12 +1249,14 @@@ static int __init acer_wmi_init(void
return -ENODEV;
}
+ set_quirks();
+
+ if (!acpi_video_backlight_support() && has_cap(ACER_CAP_BRIGHTNESS)) {
+ interface->capability &= ~ACER_CAP_BRIGHTNESS;
+ printk(ACER_INFO "Brightness must be controlled by "
+ "generic video driver\n");
+ }
+
if (platform_driver_register(&acer_platform_driver)) {
printk(ACER_ERR "Unable to register platform driver.\n");
goto error_platform_register;
next reply other threads:[~2008-08-25 5:48 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-25 5:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-01 2:10 linux-next: manual merge of the acpi tree Stephen Rothwell
2008-12-01 2:55 ` Len Brown
2008-12-01 3:02 ` Stephen Rothwell
2008-12-01 4:11 ` Len Brown
2008-12-01 4:37 ` Stephen Rothwell
2008-10-21 2:55 Stephen Rothwell
2008-10-20 4:45 Stephen Rothwell
2008-10-15 4:23 Stephen Rothwell
2008-10-15 16:10 ` Bjorn Helgaas
2008-10-15 4:14 Stephen Rothwell
2008-07-17 4:22 Stephen Rothwell
2008-07-17 7:24 ` Adrian Bunk
2008-07-18 0:37 ` Stephen Rothwell
2008-07-17 4:05 Stephen Rothwell
2008-07-17 4:00 Stephen Rothwell
2008-07-17 4:29 ` Stephen Rothwell
2008-07-16 5:33 Stephen Rothwell
2008-07-16 5:35 ` Harvey Harrison
2008-07-09 3:13 Stephen Rothwell
2008-07-08 3:03 Stephen Rothwell
2008-07-08 8:18 ` Stephen Rothwell
2008-07-08 2:59 Stephen Rothwell
2008-07-08 14:33 ` Rafael J. Wysocki
2008-06-30 5:59 Stephen Rothwell
2008-06-30 6:09 ` Stephen Rothwell
2008-06-30 9:03 ` Ingo Molnar
2008-06-27 3:14 Stephen Rothwell
2008-06-26 4:21 Stephen Rothwell
2008-06-25 4:20 Stephen Rothwell
2008-06-25 7:15 ` Ingo Molnar
2008-06-25 15:59 ` Stephen Rothwell
2008-06-25 16:29 ` Ingo Molnar
2008-06-25 19:18 ` Len Brown
2008-06-25 19:57 ` Ingo Molnar
2008-06-26 22:42 ` Len Brown
2008-06-27 7:17 ` Ingo Molnar
2008-06-25 14:24 ` Stephen Rothwell
2008-06-25 4:13 Stephen Rothwell
2008-06-23 4:19 Stephen Rothwell
2008-06-23 21:56 ` Ingo Molnar
2008-06-16 4:03 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080825154800.ff20bc0e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andi@firstfloor$(echo .)org \
--cc=lenb@kernel$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox