diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /include/linux/debugfs.h | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'include/linux/debugfs.h')
| -rw-r--r-- | include/linux/debugfs.h | 2 |
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, | |||
| 162 | return ERR_PTR(-ENODEV); | 162 | return ERR_PTR(-ENODEV); |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | struct dentry *debugfs_create_size_t(const char *name, mode_t mode, | 165 | static inline struct dentry *debugfs_create_size_t(const char *name, mode_t mode, |
| 166 | struct dentry *parent, | 166 | struct dentry *parent, |
| 167 | size_t *value) | 167 | size_t *value) |
| 168 | { | 168 | { |