Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d16b658 authored Aug 02, 2008 by Dominik Brodowski

pcmcia: don't add extra DEBUG cflag



Use CONFIG_PCMCIA_DEBUG instead of DEBUG so that dev_dbg() and other tricks
work properly.

(includes bugfixes from and
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
)

Signed-off-by: Dominik Broodwski <linux@dominikbrodowski.net>

parent 2bccc2a8

drivers/pcmcia/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -2,10 +2,6 @@
		# Makefile for the kernel pcmcia subsystem (c/o David Hinds)
		#

		ifeq ($(CONFIG_PCMCIA_DEBUG),y)
		EXTRA_CFLAGS += -DDEBUG
		endif

		pcmcia_core-y += cs.o cistpl.o rsrc_mgr.o socket_sysfs.o
		pcmcia_core-$(CONFIG_CARDBUS) += cardbus.o
		obj-$(CONFIG_PCCARD) += pcmcia_core.o

drivers/pcmcia/cs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ INT_MODULE_PARM(unreset_limit, 30); /* unreset_check's */
		/* Access speed for attribute memory windows */
		INT_MODULE_PARM(cis_speed, 300); /* ns */

		#ifdef DEBUG
		#ifdef CONFIG_PCMCIA_DEBUG
		static int pc_debug;

		module_param(pc_debug, int, 0644);

drivers/pcmcia/cs_internal.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ struct pcmcia_callback{

		int pccard_register_pcmcia(struct pcmcia_socket s, struct pcmcia_callback c);

		#ifdef DEBUG
		#ifdef CONFIG_PCMCIA_DEBUG
		extern int cs_debug_level(int);

		#define cs_dbg(skt, lvl, fmt, arg...) do { \

drivers/pcmcia/ds.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ MODULE_AUTHOR("David Hinds <dahinds@users.sourceforge.net>");
		MODULE_DESCRIPTION("PCMCIA Driver Services");
		MODULE_LICENSE("GPL");

		#ifdef DEBUG
		#ifdef CONFIG_PCMCIA_DEBUG
		int ds_pc_debug;

		module_param_named(pc_debug, ds_pc_debug, int, 0644);

drivers/pcmcia/i82365.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@
		#include "vg468.h"
		#include "ricoh.h"

		#ifdef DEBUG
		#ifdef CONFIG_PCMCIA_DEBUG
		static const char version[] =
		"i82365.c 1.265 1999/11/10 18:36:21 (David Hinds)";