Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / drivers / tty / mxser.c

diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index d188f37..7fc8c02 100644 (file)
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -39,6 +39,7 @@
 #include <linux/pci.h>
 #include <linux/bitops.h>
 #include <linux/slab.h>
+#include <linux/ratelimit.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -1490,8 +1491,7 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
 
        switch (cmd) {
        case MOXA_GET_MAJOR:
-               if (printk_ratelimit())
-                       printk(KERN_WARNING "mxser: '%s' uses deprecated ioctl "
+               printk_ratelimited(KERN_WARNING "mxser: '%s' uses deprecated ioctl "
                                        "%x (GET_MAJOR), fix your userspace\n",
                                        current->comm, cmd);
                return put_user(ttymajor, (int __user *)argp);