git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for-davem
[pandora-kernel.git]
/
include
/
linux
/
stallion.h
diff --git
a/include/linux/stallion.h
b/include/linux/stallion.h
index
0424d75
..
336af33
100644
(file)
--- a/
include/linux/stallion.h
+++ b/
include/linux/stallion.h
@@
-69,6
+69,7
@@
struct stlrq {
*/
struct stlport {
unsigned long magic;
*/
struct stlport {
unsigned long magic;
+ struct tty_port port;
unsigned int portnr;
unsigned int panelnr;
unsigned int brdnr;
unsigned int portnr;
unsigned int panelnr;
unsigned int brdnr;
@@
-76,12
+77,10
@@
struct stlport {
int uartaddr;
unsigned int pagenr;
unsigned long istate;
int uartaddr;
unsigned int pagenr;
unsigned long istate;
- int flags;
int baud_base;
int custom_divisor;
int close_delay;
int closing_wait;
int baud_base;
int custom_divisor;
int close_delay;
int closing_wait;
- int refcount;
int openwaitcnt;
int brklen;
unsigned int sigs;
int openwaitcnt;
int brklen;
unsigned int sigs;
@@
-92,9
+91,6
@@
struct stlport {
unsigned long clk;
unsigned long hwid;
void *uartp;
unsigned long clk;
unsigned long hwid;
void *uartp;
- struct tty_struct *tty;
- wait_queue_head_t open_wait;
- wait_queue_head_t close_wait;
comstats_t stats;
struct stlrq tx;
};
comstats_t stats;
struct stlrq tx;
};