lkml.org 
[lkml]   [2009]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 2.6.29.4] Driver for CB710/720 memory card reader (MMC part) - v5 fixed
On Wed, May 27, 2009 at 10:13:42PM +0200, Pierre Ossman wrote:
> On Fri, 22 May 2009 20:33:59 +0200
> Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote:
[cut: CB710 driver patch description]
> Queued.

One more fixup for the driver following.

Best Regards,
Michał Mirosław

---here---
cb710: Fix compilation warning in DEBUG case.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>

diff -urpN test1/drivers/misc/cb710/Kconfig test2/drivers/misc/cb710/Kconfig
--- test1/drivers/misc/cb710/Kconfig 2009-06-04 12:20:29.000000000 +0200
+++ test2/drivers/misc/cb710/Kconfig 2009-06-04 10:53:34.000000000 +0200
@@ -19,3 +19,8 @@ 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 -urpN test1/drivers/misc/cb710/Makefile test2/drivers/misc/cb710/Makefile
--- test1/drivers/misc/cb710/Makefile 2009-06-04 12:20:29.000000000 +0200
+++ test2/drivers/misc/cb710/Makefile 2009-06-04 10:53:34.000000000 +0200
@@ -2,3 +2,5 @@ obj-$(CONFIG_CB710_CORE) += cb710.o

cb710-y := core.o sgbuf2.o
cb710-$(CONFIG_CB710_DEBUG) += debug.o
+
+ccflags-$(CONFIG_CB710_DEBUG) += -DDEBUG
diff -urpN test1/drivers/mmc/host/Makefile test2/drivers/mmc/host/Makefile
--- test1/drivers/mmc/host/Makefile 2009-06-04 12:20:29.000000000 +0200
+++ test2/drivers/mmc/host/Makefile 2009-06-04 10:53:34.000000000 +0200
@@ -29,3 +29,7 @@ obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_
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 -urpN test1/include/linux/cb710.h test2/include/linux/cb710.h
--- test1/include/linux/cb710.h 2009-06-04 12:20:29.000000000 +0200
+++ test2/include/linux/cb710.h 2009-06-04 10:53:34.000000000 +0200
@@ -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>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2009-06-04 12:29    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site