Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / wireless / lib80211.c

diff --git a/net/wireless/lib80211.c b/net/wireless/lib80211.c
index 97d411f7450707294038ad0272d7cc1d1a544e2a..3268fac5ab22d3551d6c1573f55a2f2fd9fd23e5 100644 (file)
--- a/net/wireless/lib80211.c
+++ b/net/wireless/lib80211.c
@@ -13,6 +13,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/ieee80211.h>
@@ -224,8 +226,8 @@ int lib80211_unregister_crypto_ops(struct lib80211_crypto_ops *ops)
        return -EINVAL;
 
       found:
-       printk(KERN_DEBUG "lib80211_crypt: unregistered algorithm "
-              "'%s'\n", ops->name);
+       printk(KERN_DEBUG "lib80211_crypt: unregistered algorithm '%s'\n",
+              ops->name);
        list_del(&alg->list);
        spin_unlock_irqrestore(&lib80211_crypto_lock, flags);
        kfree(alg);
@@ -270,7 +272,7 @@ static struct lib80211_crypto_ops lib80211_crypt_null = {
 
 static int __init lib80211_init(void)
 {
-       printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION "\n");
+       pr_info(DRV_DESCRIPTION "\n");
        return lib80211_register_crypto_ops(&lib80211_crypt_null);
 }