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 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
cacheinfo.c
diff --git
a/arch/powerpc/kernel/cacheinfo.c
b/arch/powerpc/kernel/cacheinfo.c
index
bb37b1d
..
a3c684b
100644
(file)
--- a/
arch/powerpc/kernel/cacheinfo.c
+++ b/
arch/powerpc/kernel/cacheinfo.c
@@
-19,6
+19,7
@@
#include <linux/notifier.h>
#include <linux/of.h>
#include <linux/percpu.h>
#include <linux/notifier.h>
#include <linux/of.h>
#include <linux/percpu.h>
+#include <linux/slab.h>
#include <asm/prom.h>
#include "cacheinfo.h"
#include <asm/prom.h>
#include "cacheinfo.h"
@@
-642,7
+643,7
@@
static struct kobj_attribute *cache_index_opt_attrs[] = {
&cache_assoc_attr,
};
&cache_assoc_attr,
};
-static struct sysfs_ops cache_index_ops = {
+static
const
struct sysfs_ops cache_index_ops = {
.show = cache_index_show,
};
.show = cache_index_show,
};