https://github.com/torvalds/linux
Revision f3161f36f5f49ee995b90d6207d8b6d990355e0a authored by Linus Torvalds on 23 October 2008, 18:54:08 UTC, committed by Linus Torvalds on 23 October 2008, 18:54:08 UTC
This was another merge problem that wasn't a data conflict, but due to
independent changes in two branches that just didn't work together.

The pcc-acpi staging driver used

	acpi_driver_data(device) = hotkey;

to set driver data, but the ACPI merge made that invalid in commit
db89b4f0dbab837d0f3de2c3e9427a8d5393afa3 ("ACPI: catch calls of
acpi_driver_data on pointer of wrong type"), and now you're supposed to
just do.

	device->driver_data = hotkey;

instead.

Fix it up.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 12e1ec9
History
Tip revision: f3161f36f5f49ee995b90d6207d8b6d990355e0a authored by Linus Torvalds on 23 October 2008, 18:54:08 UTC
pcc-acpi: fix compile with new stricter ACPI types
Tip revision: f3161f3
File Mode Size
Documentation
arch
block
crypto
drivers
firmware
fs
include
init
ipc
kernel
lib
mm
net
samples
scripts
security
sound
usr
virt
.gitignore -rw-r--r-- 867 bytes
.mailmap -rw-r--r-- 3.7 KB
COPYING -rw-r--r-- 18.3 KB
CREDITS -rw-r--r-- 91.0 KB
Kbuild -rw-r--r-- 2.4 KB
MAINTAINERS -rw-r--r-- 102.0 KB
Makefile -rw-r--r-- 55.4 KB
README -rw-r--r-- 16.5 KB
REPORTING-BUGS -rw-r--r-- 3.1 KB

README

back to top