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

Commit e3c07b96 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds
Browse files

[PATCH] ISDN: Rename debug option CONFIG_SERIAL_NOPAUSE_IO 



Based on advice from K.  Keil, rename the special debug option
CONFIG_SERIAL_NOPAUSE_IO to ELSA_SERIAL_NOPAUSE_IO so it no longer resembles a
user-selectable kernel config option.

Signed-off-by: default avatarRobert P. J. Day <rpjday@mindspring.com>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 26fb5c58

drivers/isdn/hisax/elsa_ser.c

+4 −4
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static inline unsigned int serial_in(struct IsdnCardState *cs, int offset) 
static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset)

{

#ifdef SERIAL_DEBUG_REG

#ifdef CONFIG_SERIAL_NOPAUSE_IO

#ifdef ELSA_SERIAL_NOPAUSE_IO

	u_int val = inb(cs->hw.elsa.base + 8 + offset);

	debugl1(cs,"inp  %s %02x",ModemIn[offset], val);

#else
@@ -67,7 +67,7 @@ static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset) 
#endif

	return(val);

#else

#ifdef CONFIG_SERIAL_NOPAUSE_IO

#ifdef ELSA_SERIAL_NOPAUSE_IO

	return inb(cs->hw.elsa.base + 8 + offset);

#else

	return inb_p(cs->hw.elsa.base + 8 + offset);
@@ -87,13 +87,13 @@ static inline void serial_outp(struct IsdnCardState *cs, int offset, 
			       int value)

{

#ifdef SERIAL_DEBUG_REG

#ifdef CONFIG_SERIAL_NOPAUSE_IO

#ifdef ELSA_SERIAL_NOPAUSE_IO

	debugl1(cs,"outp %s %02x",ModemOut[offset], value);

#else

	debugl1(cs,"outP %s %02x",ModemOut[offset], value);

#endif

#endif

#ifdef CONFIG_SERIAL_NOPAUSE_IO

#ifdef ELSA_SERIAL_NOPAUSE_IO

	outb(value, cs->hw.elsa.base + 8 + offset);

#else

    	outb_p(value, cs->hw.elsa.base + 8 + offset);