diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /include/linux/ext2_fs.h | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'include/linux/ext2_fs.h')
| -rw-r--r-- | include/linux/ext2_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h index 2efe7b863cff..78c775a83f7c 100644 --- a/include/linux/ext2_fs.h +++ b/include/linux/ext2_fs.h | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | #ifdef EXT2FS_DEBUG | 47 | #ifdef EXT2FS_DEBUG |
| 48 | # define ext2_debug(f, a...) { \ | 48 | # define ext2_debug(f, a...) { \ |
| 49 | printk ("EXT2-fs DEBUG (%s, %d): %s:", \ | 49 | printk ("EXT2-fs DEBUG (%s, %d): %s:", \ |
| 50 | __FILE__, __LINE__, __FUNCTION__); \ | 50 | __FILE__, __LINE__, __func__); \ |
| 51 | printk (f, ## a); \ | 51 | printk (f, ## a); \ |
| 52 | } | 52 | } |
| 53 | #else | 53 | #else |