summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-06 16:57:34 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-06 16:57:34 -0800
commit085f20e481190cd0597d72ec49bffc07bda4c9be (patch)
tree1500ff072b477c28ceb2a5f134254db5e800d061 /include
parent3c726f8dee6f55e96475574e9f645327e461884c (diff)
parent21c614a7899046ab108b3d327d76c33443a8ebf2 (diff)
downloadblackbird-op-linux-085f20e481190cd0597d72ec49bffc07bda4c9be.tar.gz
blackbird-op-linux-085f20e481190cd0597d72ec49bffc07bda4c9be.zip
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include')
-rw-r--r--include/linux/serial_8250.h1
-rw-r--r--include/linux/serial_core.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 2b799d40d669..cee302aefdb7 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -42,6 +42,7 @@ enum {
PLAT8250_DEV_BOCA,
PLAT8250_DEV_HUB6,
PLAT8250_DEV_MCA,
+ PLAT8250_DEV_AU1X00,
};
/*
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 9d2579230689..a3ac92b19aca 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -211,6 +211,7 @@ struct uart_port {
#define UPIO_HUB6 (1)
#define UPIO_MEM (2)
#define UPIO_MEM32 (3)
+#define UPIO_AU (4) /* Au1x00 type IO */
unsigned int read_status_mask; /* driver specific */
unsigned int ignore_status_mask; /* driver specific */
OpenPOWER on IntegriCloud