diff options
| author | Linus Torvalds <[email protected]> | 2008-10-23 18:54:08 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-10-23 18:54:08 +0000 |
| commit | f3161f36f5f49ee995b90d6207d8b6d990355e0a (patch) | |
| tree | e0ae01fa546e91e676e9f067a204337a6e873301 /net/unix/af_unix.c | |
| parent | ext3 quota support: fix compile failure (diff) | |
| download | kernel-f3161f36f5f49ee995b90d6207d8b6d990355e0a.tar.gz kernel-f3161f36f5f49ee995b90d6207d8b6d990355e0a.zip | |
pcc-acpi: fix compile with new stricter ACPI types
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 <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions