diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/hp/sim/simserial.c | 7 | ||||
| -rw-r--r-- | arch/xtensa/platform-iss/console.c | 4 | 
2 files changed, 1 insertions, 10 deletions
| diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 626cdc83668b..0e5c6ae50228 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c | |||
| @@ -46,11 +46,6 @@ | |||
| 46 | #define KEYBOARD_INTR 3 /* must match with simulator! */ | 46 | #define KEYBOARD_INTR 3 /* must match with simulator! */ | 
| 47 | 47 | ||
| 48 | #define NR_PORTS 1 /* only one port for now */ | 48 | #define NR_PORTS 1 /* only one port for now */ | 
| 49 | #define SERIAL_INLINE 1 | ||
| 50 | |||
| 51 | #ifdef SERIAL_INLINE | ||
| 52 | #define _INLINE_ inline | ||
| 53 | #endif | ||
| 54 | 49 | ||
| 55 | #define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT) | 50 | #define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT) | 
| 56 | 51 | ||
| @@ -237,7 +232,7 @@ static void rs_put_char(struct tty_struct *tty, unsigned char ch) | |||
| 237 | local_irq_restore(flags); | 232 | local_irq_restore(flags); | 
| 238 | } | 233 | } | 
| 239 | 234 | ||
| 240 | static _INLINE_ void transmit_chars(struct async_struct *info, int *intr_done) | 235 | static void transmit_chars(struct async_struct *info, int *intr_done) | 
| 241 | { | 236 | { | 
| 242 | int count; | 237 | int count; | 
| 243 | unsigned long flags; | 238 | unsigned long flags; | 
| diff --git a/arch/xtensa/platform-iss/console.c b/arch/xtensa/platform-iss/console.c index 94fdfe474ac1..2a580efb58ec 100644 --- a/arch/xtensa/platform-iss/console.c +++ b/arch/xtensa/platform-iss/console.c | |||
| @@ -31,10 +31,6 @@ | |||
| 31 | #include <linux/tty.h> | 31 | #include <linux/tty.h> | 
| 32 | #include <linux/tty_flip.h> | 32 | #include <linux/tty_flip.h> | 
| 33 | 33 | ||
| 34 | #ifdef SERIAL_INLINE | ||
| 35 | #define _INLINE_ inline | ||
| 36 | #endif | ||
| 37 | |||
| 38 | #define SERIAL_MAX_NUM_LINES 1 | 34 | #define SERIAL_MAX_NUM_LINES 1 | 
| 39 | #define SERIAL_TIMER_VALUE (20 * HZ) | 35 | #define SERIAL_TIMER_VALUE (20 * HZ) | 
| 40 | 36 | ||
