projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-3.12-merge' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
power
/
olpc_battery.c
diff --git
a/drivers/power/olpc_battery.c
b/drivers/power/olpc_battery.c
index
298c47d
..
1ec810a
100644
(file)
--- a/
drivers/power/olpc_battery.c
+++ b/
drivers/power/olpc_battery.c
@@
-668,7
+668,7
@@
static int olpc_battery_remove(struct platform_device *pdev)
return 0;
}
-static const struct of_device_id olpc_battery_ids[]
__devinitconst
= {
+static const struct of_device_id olpc_battery_ids[] = {
{ .compatible = "olpc,xo1-battery" },
{}
};