pcc-acpi: fix compile with new stricter ACPI types
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 18:54:08 +0000 (11:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 18:54:08 +0000 (11:54 -0700)
commitf3161f36f5f49ee995b90d6207d8b6d990355e0a
treee0ae01fa546e91e676e9f067a204337a6e873301
parent12e1ec9ff31d388305da644b452c9f80d244aa55
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 <torvalds@linux-foundation.org>
drivers/staging/pcc-acpi/pcc-acpi.c