mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-18 17:54:13 +08:00
f3161f36f5
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
|
||
---|---|---|
.. | ||
at76_usb | ||
echo | ||
et131x | ||
go7007 | ||
me4000 | ||
pcc-acpi | ||
poch | ||
slicoss | ||
sxg | ||
usbip | ||
winbond | ||
wlan-ng | ||
Kconfig | ||
Makefile | ||
staging.c |