diff --git a/[refs] b/[refs]
index 2bfe72fa9403..708f8412d8df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cc36c724eb60b5e5457807f3230e5bb5454e4d0
+refs/heads/master: 23415eb5233eb3c1939c4cb7d6235af98a3a2955
diff --git a/trunk/drivers/acpi/glue.c b/trunk/drivers/acpi/glue.c
index 01551840d236..95af6f674a6c 100644
--- a/trunk/drivers/acpi/glue.c
+++ b/trunk/drivers/acpi/glue.c
@@ -18,9 +18,14 @@
 
 #define ACPI_GLUE_DEBUG	0
 #if ACPI_GLUE_DEBUG
-#define DBG(x...) printk(PREFIX x)
+#define DBG(fmt, ...)						\
+	printk(KERN_DEBUG PREFIX fmt, ##__VA_ARGS__)
 #else
-#define DBG(x...) do { } while(0)
+#define DBG(fmt, ...)						\
+do {								\
+	if (0)							\
+		printk(KERN_DEBUG PREFIX fmt, ##__VA_ARGS__);	\
+} while (0)
 #endif
 static LIST_HEAD(bus_type_list);
 static DECLARE_RWSEM(bus_type_sem);