[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi branches...

[~andy/linux] / drivers / char / rio / parmmap.h

diff --git a/drivers/char/rio/parmmap.h b/drivers/char/rio/parmmap.h
index 46f99dfdac8d3c2f03c0a30110b289f097f148ab..fe4e00567065150d84e3aa3cb190caa936acdf21 100644 (file)
--- a/drivers/char/rio/parmmap.h
+++ b/drivers/char/rio/parmmap.h
@@ -44,53 +44,50 @@
 #endif
 #endif
 
-typedef struct PARM_MAP PARM_MAP ;
+typedef struct PARM_MAP PARM_MAP;
 
-struct PARM_MAP
-{
-PHB_ptr           phb_ptr ;              /* Pointer to the PHB array */
-WORD_ptr          phb_num_ptr ;          /* Ptr to Number of PHB's */
-FREE_LIST_ptr     free_list;             /* Free List pointer */
-FREE_LIST_ptr     free_list_end;         /* Free List End pointer */
-Q_BUF_ptr_ptr     q_free_list_ptr ;      /* Ptr to Q_BUF variable */
-BYTE_ptr          unit_id_ptr ;          /* Unit Id */
-LPB_ptr           link_str_ptr ;         /* Link Structure Array */
-BYTE_ptr          bootloader_1 ;         /* 1st Stage Boot Loader */
-BYTE_ptr          bootloader_2 ;         /* 2nd Stage Boot Loader */
-WORD_ptr          port_route_map_ptr ;   /* Port Route Map */
-ROUTE_STR_ptr     route_ptr ;            /* Unit Route Map */
-NUMBER_ptr        map_present ;          /* Route Map present */
-NUMBER            pkt_num ;               /* Total number of packets */
-NUMBER            q_num ;                 /* Total number of Q packets */
-WORD              buffers_per_port ;      /* Number of buffers per port */
-WORD              heap_size ;             /* Initial size of heap */
-WORD              heap_left ;             /* Current Heap left */
-WORD              error ;                 /* Error code */
-WORD              tx_max;                 /* Max number of tx pkts per phb */
-WORD              rx_max;                 /* Max number of rx pkts per phb */
-WORD              rx_limit;               /* For high / low watermarks */
-NUMBER            links ;                 /* Links to use */
-NUMBER            timer ;                 /* Interrupts per second */
-RUP_ptr           rups ;                 /* Pointer to the RUPs */
-WORD              max_phb ;              /* Mostly for debugging */
-WORD              living ;               /* Just increments!! */
-WORD              init_done ;            /* Initialisation over */
-WORD              booting_link ;
-WORD              idle_count ;           /* Idle time counter */
-WORD              busy_count ;           /* Busy counter */
-WORD              idle_control ;         /* Control Idle Process */
+struct PARM_MAP {
+       PHB_ptr phb_ptr;        /* Pointer to the PHB array */
+       WORD_ptr phb_num_ptr;   /* Ptr to Number of PHB's */
+       FREE_LIST_ptr free_list;        /* Free List pointer */
+       FREE_LIST_ptr free_list_end;    /* Free List End pointer */
+       Q_BUF_ptr_ptr q_free_list_ptr;  /* Ptr to Q_BUF variable */
+       BYTE_ptr unit_id_ptr;   /* Unit Id */
+       LPB_ptr link_str_ptr;   /* Link Structure Array */
+       BYTE_ptr bootloader_1;  /* 1st Stage Boot Loader */
+       BYTE_ptr bootloader_2;  /* 2nd Stage Boot Loader */
+       WORD_ptr port_route_map_ptr;    /* Port Route Map */
+       ROUTE_STR_ptr route_ptr;        /* Unit Route Map */
+       NUMBER_ptr map_present; /* Route Map present */
+       NUMBER pkt_num;         /* Total number of packets */
+       NUMBER q_num;           /* Total number of Q packets */
+       WORD buffers_per_port;  /* Number of buffers per port */
+       WORD heap_size;         /* Initial size of heap */
+       WORD heap_left;         /* Current Heap left */
+       WORD error;             /* Error code */
+       WORD tx_max;            /* Max number of tx pkts per phb */
+       WORD rx_max;            /* Max number of rx pkts per phb */
+       WORD rx_limit;          /* For high / low watermarks */
+       NUMBER links;           /* Links to use */
+       NUMBER timer;           /* Interrupts per second */
+       RUP_ptr rups;           /* Pointer to the RUPs */
+       WORD max_phb;           /* Mostly for debugging */
+       WORD living;            /* Just increments!! */
+       WORD init_done;         /* Initialisation over */
+       WORD booting_link;
+       WORD idle_count;        /* Idle time counter */
+       WORD busy_count;        /* Busy counter */
+       WORD idle_control;      /* Control Idle Process */
 #if defined(HOST) || defined(INKERNEL)
-WORD              tx_intr;               /* TX interrupt pending */
-WORD              rx_intr;               /* RX interrupt pending */
-WORD              rup_intr;              /* RUP interrupt pending */
+       WORD tx_intr;           /* TX interrupt pending */
+       WORD rx_intr;           /* RX interrupt pending */
+       WORD rup_intr;          /* RUP interrupt pending */
 #endif
 #if defined(RTA)
-WORD             dying_count;          /* Count of processes dead */
+       WORD dying_count;       /* Count of processes dead */
 #endif
-} ;
+};
 
 #endif
 
 /*********** end of file ***********/
-
-