git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6]
/
include
/
linux
/
serial_core.h
diff --git
a/include/linux/serial_core.h
b/include/linux/serial_core.h
index
ade1536
..
f10db6e
100644
(file)
--- a/
include/linux/serial_core.h
+++ b/
include/linux/serial_core.h
@@
-184,6
+184,7
@@
/* Altera UARTs */
#define PORT_ALTERA_JTAGUART 91
+#define PORT_ALTERA_UART 92
#ifdef __KERNEL__
@@
-249,6
+250,7
@@
struct uart_ops {
#endif
};
+#define NO_POLL_CHAR 0x00ff0000
#define UART_CONFIG_TYPE (1 << 0)
#define UART_CONFIG_IRQ (1 << 1)