summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-27 04:21:26 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-27 04:21:26 +0100
commit5ee810072175042775e39bdd3eaaa68884c27805 (patch)
tree78776d793a11189de7d1d280f37f83f8f96f60c8 /include
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-5ee810072175042775e39bdd3eaaa68884c27805.tar.xz
linux-5ee810072175042775e39bdd3eaaa68884c27805.zip
Fix "multiple definition of `debugfs_create_size_t'"
Introduced by 8adb711f3668b034e7b956fac951ed08b53e0d55 ("debugfs: introduce stub for debugfs_create_size_t() when DEBUG_FS=n") and due to a simple missing "static inline". Reported-and-tested-by: Jeff Chua <jeff.chua.linux@gmail.com> Acked-by: Greg KH <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/debugfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index 0f5c33b0bd3e..af0e01d4c663 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -162,7 +162,7 @@ static inline struct dentry *debugfs_create_x32(const char *name, mode_t mode,
return ERR_PTR(-ENODEV);
}
-struct dentry *debugfs_create_size_t(const char *name, mode_t mode,
+static inline struct dentry *debugfs_create_size_t(const char *name, mode_t mode,
struct dentry *parent,
size_t *value)
{