Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 26 insertions, 26 deletions

diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index 13a37f137ea2..4a0a329beafb 100644
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -52,11 +52,11 @@
  *      protection - since "write" code only needs to change the head, and
  *      interrupt code only needs to change the tail.
  */
-typedef struct {
+struct stlrq {
         char    *buf;
         char    *head;
         char    *tail;
-} stlrq_t;
+};
 
 /*
  *      Port, panel and board structures to hold status info about each.
@@ -67,14 +67,14 @@ typedef struct {
  *      is associated with, this makes it (fairly) easy to get back to the
  *      board/panel info for a port.
  */
-typedef struct stlport {
+struct stlport {
         unsigned long           magic;
-        int                     portnr;
-        int                     panelnr;
-        int                     brdnr;
+        unsigned int            portnr;
+        unsigned int            panelnr;
+        unsigned int            brdnr;
         int                     ioaddr;
         int                     uartaddr;
-        int                     pagenr;
+        unsigned int            pagenr;
         long                    istate;
         int                     flags;
         int                     baud_base;
@@ -97,31 +97,31 @@ typedef struct stlport {
         wait_queue_head_t       close_wait;
         struct work_struct      tqueue;
         comstats_t              stats;
-        stlrq_t                 tx;
-} stlport_t;
+        struct stlrq            tx;
+};
 
-typedef struct stlpanel {
+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);
         unsigned int    hwid;
         unsigned int    ackmask;
-        stlport_t       *ports[STL_PORTSPERPANEL];
-} stlpanel_t;
+        struct stlport  *ports[STL_PORTSPERPANEL];
+};
 
-typedef struct stlbrd {
+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);
@@ -136,9 +136,9 @@ typedef struct stlbrd {
         unsigned long   clk;
         unsigned int    bnkpageaddr[STL_MAXBANKS];
         unsigned int    bnkstataddr[STL_MAXBANKS];
-        stlpanel_t      *bnk2panel[STL_MAXBANKS];
-        stlpanel_t      *panels[STL_MAXPANELS];
-} stlbrd_t;
+        struct stlpanel *bnk2panel[STL_MAXBANKS];
+        struct stlpanel *panels[STL_MAXPANELS];
+};
 
 
 /*