diff options
author | Robert P. J. Day <rpjday@mindspring.com> | 2007-02-12 03:53:21 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:34 -0500 |
commit | e3c07b9615ee123113de2e881143eb74442d3bf5 (patch) | |
tree | 95be1da54b1641e2fc1649baadc24b1a1c7497d2 /drivers | |
parent | 26fb5c5810afa0d8209ceff7cb267398be53829d (diff) |
[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: Robert P. J. Day <rpjday@mindspring.com>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/isdn/hisax/elsa_ser.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c index 0279fb323cb1..ae377e812775 100644 --- a/drivers/isdn/hisax/elsa_ser.c +++ b/drivers/isdn/hisax/elsa_ser.c | |||
@@ -58,7 +58,7 @@ static inline unsigned int serial_in(struct IsdnCardState *cs, int offset) | |||
58 | static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset) | 58 | static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset) |
59 | { | 59 | { |
60 | #ifdef SERIAL_DEBUG_REG | 60 | #ifdef SERIAL_DEBUG_REG |
61 | #ifdef CONFIG_SERIAL_NOPAUSE_IO | 61 | #ifdef ELSA_SERIAL_NOPAUSE_IO |
62 | u_int val = inb(cs->hw.elsa.base + 8 + offset); | 62 | u_int val = inb(cs->hw.elsa.base + 8 + offset); |
63 | debugl1(cs,"inp %s %02x",ModemIn[offset], val); | 63 | debugl1(cs,"inp %s %02x",ModemIn[offset], val); |
64 | #else | 64 | #else |
@@ -67,7 +67,7 @@ static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset) | |||
67 | #endif | 67 | #endif |
68 | return(val); | 68 | return(val); |
69 | #else | 69 | #else |
70 | #ifdef CONFIG_SERIAL_NOPAUSE_IO | 70 | #ifdef ELSA_SERIAL_NOPAUSE_IO |
71 | return inb(cs->hw.elsa.base + 8 + offset); | 71 | return inb(cs->hw.elsa.base + 8 + offset); |
72 | #else | 72 | #else |
73 | return inb_p(cs->hw.elsa.base + 8 + offset); | 73 | return inb_p(cs->hw.elsa.base + 8 + offset); |
@@ -87,13 +87,13 @@ static inline void serial_outp(struct IsdnCardState *cs, int offset, | |||
87 | int value) | 87 | int value) |
88 | { | 88 | { |
89 | #ifdef SERIAL_DEBUG_REG | 89 | #ifdef SERIAL_DEBUG_REG |
90 | #ifdef CONFIG_SERIAL_NOPAUSE_IO | 90 | #ifdef ELSA_SERIAL_NOPAUSE_IO |
91 | debugl1(cs,"outp %s %02x",ModemOut[offset], value); | 91 | debugl1(cs,"outp %s %02x",ModemOut[offset], value); |
92 | #else | 92 | #else |
93 | debugl1(cs,"outP %s %02x",ModemOut[offset], value); | 93 | debugl1(cs,"outP %s %02x",ModemOut[offset], value); |
94 | #endif | 94 | #endif |
95 | #endif | 95 | #endif |
96 | #ifdef CONFIG_SERIAL_NOPAUSE_IO | 96 | #ifdef ELSA_SERIAL_NOPAUSE_IO |
97 | outb(value, cs->hw.elsa.base + 8 + offset); | 97 | outb(value, cs->hw.elsa.base + 8 + offset); |
98 | #else | 98 | #else |
99 | outb_p(value, cs->hw.elsa.base + 8 + offset); | 99 | outb_p(value, cs->hw.elsa.base + 8 + offset); |