summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 14:25:30 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-27 14:25:30 -0700
commit2cb14596a03036bb8b9d3c60f9c4dbdf3a745c76 (patch)
tree9bb4fbc01ff4506b4ae85d25d37536f49354597a /include
parenta9aa0e24f7ed5acf2e0e1799fb28daf928293ba1 (diff)
parent5bd982ed0f5ae73bfd9ff452b460a3b08108bfee (diff)
downloadlinux-3.10-2cb14596a03036bb8b9d3c60f9c4dbdf3a745c76.tar.gz
linux-3.10-2cb14596a03036bb8b9d3c60f9c4dbdf3a745c76.tar.bz2
linux-3.10-2cb14596a03036bb8b9d3c60f9c4dbdf3a745c76.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: [PATCH] Added URI of "linux kernel development process" [PATCH] Kobject: possible cleanups [PATCH] Fix OCFS2 warning when DEBUG_FS is not enabled [PATCH] Kobject: fix build error [PATCH] Frame buffer: remove cmap sysfs interface
Diffstat (limited to 'include')
-rw-r--r--include/linux/debugfs.h5
-rw-r--r--include/linux/kobject.h3
2 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index 176e2d37157..047567d34ca 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -58,9 +58,8 @@ struct dentry *debugfs_create_blob(const char *name, mode_t mode,
*/
static inline struct dentry *debugfs_create_file(const char *name, mode_t mode,
- struct dentry *parent,
- void *data,
- struct file_operations *fops)
+ struct dentry *parent, void *data,
+ const struct file_operations *fops)
{
return ERR_PTR(-ENODEV);
}
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index dcd0623be89..c187c53cecd 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -257,9 +257,8 @@ struct subsys_attribute {
};
extern int subsys_create_file(struct subsystem * , struct subsys_attribute *);
-extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *);
-#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
+#if defined(CONFIG_HOTPLUG)
void kobject_uevent(struct kobject *kobj, enum kobject_action action);
int add_uevent_var(char **envp, int num_envp, int *cur_index,