summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>2009-06-13 12:37:59 +0200
committerPierre Ossman <pierre@ossman.eu>2009-06-13 22:42:59 +0200
commitc54f6bc67a4398243682f7438a2129906e127d21 (patch)
treeb3c128c917d6325a067caf8758bfd334a0b2e44b
parenta3456a2da14fb1d8246df63bb229623d58d09ce1 (diff)
cb710: more cleanup for the DEBUG case.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Signed-off-by: Pierre Ossman <pierre@ossman.eu>
-rw-r--r--drivers/misc/cb710/Kconfig4
-rw-r--r--drivers/mmc/host/Makefile3
-rw-r--r--include/linux/cb710.h3
3 files changed, 7 insertions, 3 deletions
diff --git a/drivers/misc/cb710/Kconfig b/drivers/misc/cb710/Kconfig
index 0b55079774c..22429b8b106 100644
--- a/drivers/misc/cb710/Kconfig
+++ b/drivers/misc/cb710/Kconfig
@@ -19,3 +19,7 @@ config CB710_DEBUG
This is an option for use by developers; most people should
say N here. This adds a lot of debugging output to dmesg.
+config CB710_DEBUG_ASSUMPTIONS
+ bool
+ depends on CB710_CORE != n
+ default y
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 254e441291d..79da397c5fe 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -32,3 +32,6 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o
obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o
obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
+ifeq ($(CONFIG_CB710_DEBUG),y)
+ CFLAGS-cb710-mmc += -DDEBUG
+endif
diff --git a/include/linux/cb710.h b/include/linux/cb710.h
index a09213b5261..63bc9a4d292 100644
--- a/include/linux/cb710.h
+++ b/include/linux/cb710.h
@@ -10,9 +10,6 @@
#ifndef LINUX_CB710_DRIVER_H
#define LINUX_CB710_DRIVER_H
-/* verify assumptions on platform_device framework */
-#define CONFIG_CB710_DEBUG_ASSUMPTIONS
-
#include <linux/io.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>