git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[sfrench/cifs-2.6.git]
/
arch
/
xtensa
/
platform-iss
/
console.c
diff --git
a/arch/xtensa/platform-iss/console.c
b/arch/xtensa/platform-iss/console.c
index 94fdfe474ac1c1fe36284f0d4b6cced12bf3d520..2a580efb58ecab0425827934802c01565dfeacb4 100644
(file)
--- a/
arch/xtensa/platform-iss/console.c
+++ b/
arch/xtensa/platform-iss/console.c
@@
-31,10
+31,6
@@
#include <linux/tty.h>
#include <linux/tty_flip.h>
-#ifdef SERIAL_INLINE
-#define _INLINE_ inline
-#endif
-
#define SERIAL_MAX_NUM_LINES 1
#define SERIAL_TIMER_VALUE (20 * HZ)