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);