diff --git a/[refs] b/[refs]
index c214bd69e72f..fafb027ba3a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10eb4f901cacf7da87145330f3ca77b723783497
+refs/heads/master: 9bf69a26ad9ccdc49469402275204271b3336ab6
diff --git a/trunk/drivers/misc/cb710/Makefile b/trunk/drivers/misc/cb710/Makefile
index 62d51acfecaf..7b80cbf1a609 100644
--- a/trunk/drivers/misc/cb710/Makefile
+++ b/trunk/drivers/misc/cb710/Makefile
@@ -1,3 +1,7 @@
+ifeq ($(CONFIG_CB710_DEBUG),y)
+	EXTRA_CFLAGS		+= -DDEBUG
+endif
+
 obj-$(CONFIG_CB710_CORE)	+= cb710.o
 
 cb710-y				:= core.o sgbuf2.o
diff --git a/trunk/include/linux/cb710.h b/trunk/include/linux/cb710.h
index c3819e1ce1c6..a09213b52616 100644
--- a/trunk/include/linux/cb710.h
+++ b/trunk/include/linux/cb710.h
@@ -10,10 +10,6 @@
 #ifndef LINUX_CB710_DRIVER_H
 #define LINUX_CB710_DRIVER_H
 
-#ifdef CONFIG_CB710_DEBUG
-#define DEBUG
-#endif
-
 /* verify assumptions on platform_device framework */
 #define CONFIG_CB710_DEBUG_ASSUMPTIONS