diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-03 18:04:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-03 18:04:10 +1000 |
| commit | cdcc164fdfa45cfbc6ceefd0db662cb8595d0273 (patch) | |
| tree | 5505922aea9863cbe8d6d573f4ad18a5d118a23f /include/linux/cyclades.h | |
| parent | 0ae00a3808e20a1479a4794b5c617a14bd477de3 (diff) | |
| parent | 9fd6651b708634b928622565334c51fa60ad8896 (diff) | |
Merge branch 'quilt/tty'
Conflicts:
arch/x86/include/asm/termios.h
Diffstat (limited to 'include/linux/cyclades.h')
| -rw-r--r-- | include/linux/cyclades.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index 1fbdea4f08eb..a5049eaf782d 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h @@ -499,6 +499,7 @@ struct cyclades_card { void __iomem *p9050; struct RUNTIME_9060 __iomem *p9060; } ctl_addr; + struct BOARD_CTRL __iomem *board_ctrl; /* cyz specific */ int irq; unsigned int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */ unsigned int first_line; /* minor number of first channel on card */ @@ -541,6 +542,15 @@ struct cyclades_port { int magic; struct tty_port port; struct cyclades_card *card; + union { + struct { + void __iomem *base_addr; + } cyy; + struct { + struct CH_CTRL __iomem *ch_ctrl; + struct BUF_CTRL __iomem *buf_ctrl; + } cyz; + } u; int line; int flags; /* defined in tty.h */ int type; /* UART type */ @@ -568,7 +578,6 @@ struct cyclades_port { struct cyclades_idle_stats idle_stats; struct cyclades_icount icount; struct completion shutdown_wait; - wait_queue_head_t delta_msr_wait; int throttle; }; |