projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream'
[linux-2.6-block.git]
/
include
/
linux
/
serial_8250.h
diff --git
a/include/linux/serial_8250.h
b/include/linux/serial_8250.h
index 2b799d40d66901948b07b5cd1263e6acaed06163..8e9681413726bc5db22b6ffb031870f8bf3e91bf 100644
(file)
--- a/
include/linux/serial_8250.h
+++ b/
include/linux/serial_8250.h
@@
-26,7
+26,7
@@
struct plat_serial8250_port {
unsigned char regshift; /* register shift */
unsigned char iotype; /* UPIO_* */
unsigned char hub6;
unsigned char regshift; /* register shift */
unsigned char iotype; /* UPIO_* */
unsigned char hub6;
- u
nsigned int
flags; /* UPF_* flags */
+ u
pf_t
flags; /* UPF_* flags */
};
/*
};
/*
@@
-37,11
+37,13
@@
enum {
PLAT8250_DEV_LEGACY = -1,
PLAT8250_DEV_PLATFORM,
PLAT8250_DEV_PLATFORM1,
PLAT8250_DEV_LEGACY = -1,
PLAT8250_DEV_PLATFORM,
PLAT8250_DEV_PLATFORM1,
+ PLAT8250_DEV_PLATFORM2,
PLAT8250_DEV_FOURPORT,
PLAT8250_DEV_ACCENT,
PLAT8250_DEV_BOCA,
PLAT8250_DEV_HUB6,
PLAT8250_DEV_MCA,
PLAT8250_DEV_FOURPORT,
PLAT8250_DEV_ACCENT,
PLAT8250_DEV_BOCA,
PLAT8250_DEV_HUB6,
PLAT8250_DEV_MCA,
+ PLAT8250_DEV_AU1X00,
};
/*
};
/*