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 mainline v2.6.27-rc2 tree into linux-omap tree
[pandora-kernel.git]
/
drivers
/
xen
/
balloon.c
diff --git
a/drivers/xen/balloon.c
b/drivers/xen/balloon.c
index
591bc29
..
d4427cb
100644
(file)
--- a/
drivers/xen/balloon.c
+++ b/
drivers/xen/balloon.c
@@
-610,6
+610,7
@@
static ssize_t show_target_kb(struct sys_device *dev, char *buf)
}
static ssize_t store_target_kb(struct sys_device *dev,
+ struct sysdev_attribute *attr,
const char *buf,
size_t count)
{