From b69feb27f5bda1ff66838f0ae99134e6f6fae011 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 23 Oct 2008 11:54:08 -0700 Subject: [PATCH] --- yaml --- r: 117635 b: refs/heads/master c: f3161f36f5f49ee995b90d6207d8b6d990355e0a h: refs/heads/master i: 117633: 779ee0e799f835cd8f800bd2c12b4b52976c6a8b 117631: b7ca0fcc8df06653d12c3436a53837d4f609a13f v: v3 --- [refs] | 2 +- trunk/drivers/staging/pcc-acpi/pcc-acpi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 34e3573340f0..249e6a8627b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12e1ec9ff31d388305da644b452c9f80d244aa55 +refs/heads/master: f3161f36f5f49ee995b90d6207d8b6d990355e0a diff --git a/trunk/drivers/staging/pcc-acpi/pcc-acpi.c b/trunk/drivers/staging/pcc-acpi/pcc-acpi.c index 7715c31f2731..3b34a3e4885a 100644 --- a/trunk/drivers/staging/pcc-acpi/pcc-acpi.c +++ b/trunk/drivers/staging/pcc-acpi/pcc-acpi.c @@ -1011,7 +1011,7 @@ static int __devinit acpi_pcc_hotkey_add(struct acpi_device *device) hotkey->device = device; hotkey->handle = device->handle; hotkey->num_sifr = num_sifr; - acpi_driver_data(device) = hotkey; + device->driver_data = hotkey; strcpy(acpi_device_name(device), ACPI_PCC_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_PCC_CLASS);