Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index e95e7c6e7b04ed439d1c4008fc5ac00533a1961c..bee36100f110ab75617ad4dce16beac9e1434f76 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1251,6 +1251,7 @@ void tty_write_message(struct tty_struct *tty, char *msg)
        return;
 }
 
+#if defined CONFIG_PRINTK
 /*
  * printk rate limiting, lifted from the networking subsystem.
  *
@@ -1320,3 +1321,4 @@ bool printk_timed_ratelimit(unsigned long *caller_jiffies,
        return false;
 }
 EXPORT_SYMBOL(printk_timed_ratelimit);
+#endif