git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan...
[pandora-kernel.git]
/
drivers
/
acpi
/
sbs.c
diff --git
a/drivers/acpi/sbs.c
b/drivers/acpi/sbs.c
index
7b011e7
..
6050ce4
100644
(file)
--- a/
drivers/acpi/sbs.c
+++ b/
drivers/acpi/sbs.c
@@
-931,7
+931,7
@@
static int acpi_sbs_add(struct acpi_device *device)
sbs->device = device;
strcpy(acpi_device_name(device), ACPI_SBS_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_SBS_CLASS);
-
acpi_driver_data(device)
= sbs;
+
device->driver_data
= sbs;
result = acpi_charger_add(sbs);
if (result)