From: Stephen Rothwell Date: Thu, 23 Oct 2008 21:35:19 +0000 (+0100) Subject: leds/acpi: Fix merge fallout from acpi_driver_data change X-Git-Tag: v2.6.28-rc1~6^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=601a1b92ed3ce0025f7bec6fc591cceaef8d9d69;p=linux-2.6-omap-h63xx.git leds/acpi: Fix merge fallout from acpi_driver_data change Signed-off-by: Stephen Rothwell Signed-off-by: Richard Purdie --- diff --git a/drivers/leds/leds-hp-disk.c b/drivers/leds/leds-hp-disk.c index d636280198a..53a25b1c2da 100644 --- a/drivers/leds/leds-hp-disk.c +++ b/drivers/leds/leds-hp-disk.c @@ -98,7 +98,7 @@ static int hpled_add(struct acpi_device *device) adev.device = device; strcpy(acpi_device_name(device), DRIVER_NAME); strcpy(acpi_device_class(device), ACPI_MDPS_CLASS); - acpi_driver_data(device) = &adev; + device->driver_data = &adev; ret = led_classdev_register(NULL, &hpled_led); return ret;