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 'for-linus' of git://git.infradead.org/users/eparis/notify
[pandora-kernel.git]
/
lib
/
kobject.c
diff --git
a/lib/kobject.c
b/lib/kobject.c
index
b512b74
..
8115eb1
100644
(file)
--- a/
lib/kobject.c
+++ b/
lib/kobject.c
@@
-700,7
+700,7
@@
static ssize_t kobj_attr_store(struct kobject *kobj, struct attribute *attr,
return ret;
}
return ret;
}
-struct sysfs_ops kobj_sysfs_ops = {
+
const
struct sysfs_ops kobj_sysfs_ops = {
.show = kobj_attr_show,
.store = kobj_attr_store,
};
.show = kobj_attr_show,
.store = kobj_attr_store,
};
@@
-789,7
+789,7
@@
static struct kobj_type kset_ktype = {
* If the kset was not able to be created, NULL will be returned.
*/
static struct kset *kset_create(const char *name,
* If the kset was not able to be created, NULL will be returned.
*/
static struct kset *kset_create(const char *name,
- struct kset_uevent_ops *uevent_ops,
+
const
struct kset_uevent_ops *uevent_ops,
struct kobject *parent_kobj)
{
struct kset *kset;
struct kobject *parent_kobj)
{
struct kset *kset;
@@
-832,7
+832,7
@@
static struct kset *kset_create(const char *name,
* If the kset was not able to be created, NULL will be returned.
*/
struct kset *kset_create_and_add(const char *name,
* If the kset was not able to be created, NULL will be returned.
*/
struct kset *kset_create_and_add(const char *name,
- struct kset_uevent_ops *uevent_ops,
+
const
struct kset_uevent_ops *uevent_ops,
struct kobject *parent_kobj)
{
struct kset *kset;
struct kobject *parent_kobj)
{
struct kset *kset;