Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[mv-sheeva.git] / include / linux / cb710.h

diff --git a/include/linux/cb710.h b/include/linux/cb710.h
index c3819e1ce1c6a00ce385f597ef7225169b9eb32f..63bc9a4d292651b7713b32206c76c0cc5cee1495 100644 (file)
--- a/include/linux/cb710.h
+++ b/include/linux/cb710.h
@@ -10,13 +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
-
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>