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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
cell
/
spu_base.c
diff --git
a/arch/powerpc/platforms/cell/spu_base.c
b/arch/powerpc/platforms/cell/spu_base.c
index
78f905b
..
a5bdb89
100644
(file)
--- a/
arch/powerpc/platforms/cell/spu_base.c
+++ b/
arch/powerpc/platforms/cell/spu_base.c
@@
-703,7
+703,8
@@
static unsigned long long spu_acct_time(struct spu *spu,
}
}
-static ssize_t spu_stat_show(struct sys_device *sysdev, char *buf)
+static ssize_t spu_stat_show(struct sys_device *sysdev,
+ struct sysdev_attribute *attr, char *buf)
{
struct spu *spu = container_of(sysdev, struct spu, sysdev);
{
struct spu *spu = container_of(sysdev, struct spu, sysdev);