Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

[mv-sheeva.git] / security / keys / internal.h

diff --git a/security/keys/internal.h b/security/keys/internal.h
index addb67b169f443f136e3baf28846710e82fd0ff1..56a133d8f37d192ffb1adbc45cad9610f5cbbc5b 100644 (file)
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -15,11 +15,6 @@
 #include <linux/sched.h>
 #include <linux/key-type.h>
 
-static inline __attribute__((format(printf, 1, 2)))
-void no_printk(const char *fmt, ...)
-{
-}
-
 #ifdef __KDEBUG
 #define kenter(FMT, ...) \
        printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)