diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 10:57:55 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-05-06 10:57:55 -0400 |
| commit | 7022b15e2a9f878fd5184586064c63352c3dd225 (patch) | |
| tree | 5365c2f5bc82ae1946636ee8d5cd5d3b7e804f1b /fs/bfs/bfs.h | |
| parent | aaad2b0c757f3e6e02552cb0bdcd91a5ec0d6305 (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/bfs/bfs.h')
| -rw-r--r-- | fs/bfs/bfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bfs/bfs.h b/fs/bfs/bfs.h index 71faf4d23908..70f5d3a8eede 100644 --- a/fs/bfs/bfs.h +++ b/fs/bfs/bfs.h | |||
| @@ -42,7 +42,7 @@ static inline struct bfs_inode_info *BFS_I(struct inode *inode) | |||
| 42 | 42 | ||
| 43 | 43 | ||
| 44 | #define printf(format, args...) \ | 44 | #define printf(format, args...) \ |
| 45 | printk(KERN_ERR "BFS-fs: %s(): " format, __FUNCTION__, ## args) | 45 | printk(KERN_ERR "BFS-fs: %s(): " format, __func__, ## args) |
| 46 | 46 | ||
| 47 | /* inode.c */ | 47 | /* inode.c */ |
| 48 | extern struct inode *bfs_iget(struct super_block *sb, unsigned long ino); | 48 | extern struct inode *bfs_iget(struct super_block *sb, unsigned long ino); |