Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[safe/jmp/linux-2.6] / include / linux / stallion.h

diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index ef5270b..336af33 100644 (file)
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -69,19 +69,18 @@ struct stlrq {
  */
 struct stlport {
        unsigned long           magic;
-       int                     portnr;
-       int                     panelnr;
-       int                     brdnr;
+       struct tty_port         port;
+       unsigned int            portnr;
+       unsigned int            panelnr;
+       unsigned int            brdnr;
        int                     ioaddr;
        int                     uartaddr;
-       int                     pagenr;
-       long                    istate;
-       int                     flags;
+       unsigned int            pagenr;
+       unsigned long           istate;
        int                     baud_base;
        int                     custom_divisor;
        int                     close_delay;
        int                     closing_wait;
-       int                     refcount;
        int                     openwaitcnt;
        int                     brklen;
        unsigned int            sigs;
@@ -92,20 +91,16 @@ struct stlport {
        unsigned long           clk;
        unsigned long           hwid;
        void                    *uartp;
-       struct tty_struct       *tty;
-       wait_queue_head_t       open_wait;
-       wait_queue_head_t       close_wait;
-       struct work_struct      tqueue;
        comstats_t              stats;
        struct stlrq            tx;
 };
 
 struct stlpanel {
        unsigned long   magic;
-       int             panelnr;
-       int             brdnr;
-       int             pagenr;
-       int             nrports;
+       unsigned int    panelnr;
+       unsigned int    brdnr;
+       unsigned int    pagenr;
+       unsigned int    nrports;
        int             iobase;
        void            *uartp;
        void            (*isr)(struct stlpanel *panelp, unsigned int iobase);
@@ -116,12 +111,12 @@ struct stlpanel {
 
 struct stlbrd {
        unsigned long   magic;
-       int             brdnr;
-       int             brdtype;
-       int             state;
-       int             nrpanels;
-       int             nrports;
-       int             nrbnks;
+       unsigned int    brdnr;
+       unsigned int    brdtype;
+       unsigned int    state;
+       unsigned int    nrpanels;
+       unsigned int    nrports;
+       unsigned int    nrbnks;
        int             irq;
        int             irqtype;
        int             (*isr)(struct stlbrd *brdp);