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

[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
...@@ -58,7 +58,7 @@ static inline unsigned int serial_in(struct IsdnCardState *cs, int offset) ...@@ -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) static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset)
{ {
#ifdef SERIAL_DEBUG_REG #ifdef SERIAL_DEBUG_REG
#ifdef CONFIG_SERIAL_NOPAUSE_IO #ifdef ELSA_SERIAL_NOPAUSE_IO
u_int val = inb(cs->hw.elsa.base + 8 + offset); u_int val = inb(cs->hw.elsa.base + 8 + offset);
debugl1(cs,"inp %s %02x",ModemIn[offset], val); debugl1(cs,"inp %s %02x",ModemIn[offset], val);
#else #else
...@@ -67,7 +67,7 @@ static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset) ...@@ -67,7 +67,7 @@ static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset)
#endif #endif
return(val); return(val);
#else #else
#ifdef CONFIG_SERIAL_NOPAUSE_IO #ifdef ELSA_SERIAL_NOPAUSE_IO
return inb(cs->hw.elsa.base + 8 + offset); return inb(cs->hw.elsa.base + 8 + offset);
#else #else
return inb_p(cs->hw.elsa.base + 8 + offset); return inb_p(cs->hw.elsa.base + 8 + offset);
...@@ -87,13 +87,13 @@ static inline void serial_outp(struct IsdnCardState *cs, int offset, ...@@ -87,13 +87,13 @@ static inline void serial_outp(struct IsdnCardState *cs, int offset,
int value) int value)
{ {
#ifdef SERIAL_DEBUG_REG #ifdef SERIAL_DEBUG_REG
#ifdef CONFIG_SERIAL_NOPAUSE_IO #ifdef ELSA_SERIAL_NOPAUSE_IO
debugl1(cs,"outp %s %02x",ModemOut[offset], value); debugl1(cs,"outp %s %02x",ModemOut[offset], value);
#else #else
debugl1(cs,"outP %s %02x",ModemOut[offset], value); debugl1(cs,"outP %s %02x",ModemOut[offset], value);
#endif #endif
#endif #endif
#ifdef CONFIG_SERIAL_NOPAUSE_IO #ifdef ELSA_SERIAL_NOPAUSE_IO
outb(value, cs->hw.elsa.base + 8 + offset); outb(value, cs->hw.elsa.base + 8 + offset);
#else #else
outb_p(value, cs->hw.elsa.base + 8 + offset); outb_p(value, cs->hw.elsa.base + 8 + offset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment