Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

[karo-tx-linux.git] / drivers / staging / android / timed_output.c

diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
index 38d930cadad36738f922e4faf7018d72068836ab..ec9e2ae2de0da21f24451335c64fccc7a27b75be 100644 (file)
--- a/drivers/staging/android/timed_output.c
+++ b/drivers/staging/android/timed_output.c
@@ -14,6 +14,8 @@
  *
  */
 
+#define pr_fmt(fmt) "timed_output: " fmt
+
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/device.h>
@@ -90,7 +92,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
 
 err_create_file:
        device_destroy(timed_output_class, MKDEV(0, tdev->index));
-       printk(KERN_ERR "timed_output: Failed to register driver %s\n",
+       pr_err("failed to register driver %s\n",
                        tdev->name);
 
        return ret;