From 421f7266ab0676f3d260149e09bb27a3524f5790 Mon Sep 17 00:00:00 2001
From: David Murray <therealcykey@gmail.com>
Date: Fri, 6 Jul 2012 09:20:43 -0500
Subject: [PATCH] --- yaml --- r: 317759 b: refs/heads/master c:
 e97e6c4f9a5d23a1bd7141b6fa73e2f96282c03d h: refs/heads/master i:   317757:
 2a39861f8a1bebc5e5148c2e5d774c82f8b6c176   317755:
 91ea2e35a4c8ddd9d5bad92e3cca442afa1b5ce1   317751:
 5965d01dd0fcce8f9fc7c2b24390bece38c8ea88   317743:
 f1d8e0826d5a0c15a4f05c268647857c61bd9d5f   317727:
 d1cc9efe577ed5e5a9af5b83d3ca2a3f53c1fc52   317695:
 6bd2b170740df4dedf9eb2c551d47968da4f00eb v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/staging/ccg/ccg.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1c3ca2d9e52f..7d8ec4616cab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7183f337fef677165d3dbd09a42ee9578c94f890
+refs/heads/master: e97e6c4f9a5d23a1bd7141b6fa73e2f96282c03d
diff --git a/trunk/drivers/staging/ccg/ccg.c b/trunk/drivers/staging/ccg/ccg.c
index a5b36a97598d..c50fa020e5c8 100644
--- a/trunk/drivers/staging/ccg/ccg.c
+++ b/trunk/drivers/staging/ccg/ccg.c
@@ -1143,7 +1143,7 @@ static int ccg_bind(struct usb_composite_dev *cdev)
 	if (gcnum >= 0)
 		device_desc.bcdDevice = cpu_to_le16(0x0200 + gcnum);
 	else {
-		pr_warning("%s: controller '%s' not recognized\n",
+		pr_warn("%s: controller '%s' not recognized\n",
 			longname, gadget->name);
 		device_desc.bcdDevice = __constant_cpu_to_le16(0x9999);
 	}