diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 17:17:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 17:17:34 +0100 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /security/root_plug.c | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
| download | op-kernel-dev-cf816ecb533ab96b883dfdc0db174598b5b5c4d2.zip op-kernel-dev-cf816ecb533ab96b883dfdc0db174598b5b5c4d2.tar.gz | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'security/root_plug.c')
| -rw-r--r-- | security/root_plug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/root_plug.c b/security/root_plug.c index 870f130..6112d14 100644 --- a/security/root_plug.c +++ b/security/root_plug.c @@ -49,7 +49,7 @@ module_param(debug, bool, 0600); do { \ if (debug) \ printk(KERN_DEBUG "%s: %s: " fmt , \ - MY_NAME , __FUNCTION__ , \ + MY_NAME , __func__ , \ ## arg); \ } while (0) |
