diff options
| author | Matthew Garrett <mjg@redhat.com> | 2011-05-29 14:27:13 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-05-29 14:27:13 -0400 |
| commit | 437cb0dbd104a1564e0e78f0d486b97677f80909 (patch) | |
| tree | e066b3d65eb965ca68ecc8ef14581f2450ad3a61 /drivers/platform/x86/tc1100-wmi.c | |
| parent | 139f37f5e14cd883eee2a8a36289f544b5390a44 (diff) | |
| parent | 987dfbaa65b2c3568b85e29d2598da08a011ee09 (diff) | |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'drivers/platform/x86/tc1100-wmi.c')
| -rw-r--r-- | drivers/platform/x86/tc1100-wmi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c index 865ef78d6f1..e24f5ae475a 100644 --- a/drivers/platform/x86/tc1100-wmi.c +++ b/drivers/platform/x86/tc1100-wmi.c @@ -25,6 +25,8 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/kernel.h> #include <linux/module.h> #include <linux/slab.h> @@ -40,9 +42,6 @@ #define TC1100_INSTANCE_WIRELESS 1 #define TC1100_INSTANCE_JOGDIAL 2 -#define TC1100_LOGPREFIX "tc1100-wmi: " -#define TC1100_INFO KERN_INFO TC1100_LOGPREFIX - MODULE_AUTHOR("Jamey Hicks, Carlos Corbacho"); MODULE_DESCRIPTION("HP Compaq TC1100 Tablet WMI Extras"); MODULE_LICENSE("GPL"); @@ -264,7 +263,7 @@ static int __init tc1100_init(void) if (error) goto err_device_del; - printk(TC1100_INFO "HP Compaq TC1100 Tablet WMI Extras loaded\n"); + pr_info("HP Compaq TC1100 Tablet WMI Extras loaded\n"); return 0; err_device_del: |