Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / drivers / char / rio / rup.h

diff --git a/drivers/char/rio/rup.h b/drivers/char/rio/rup.h
index 8d44fec91dd5212a1f588c4cc7752865a847d990..4ae90cb207a9eda66dd6994dd0ca3170893a1742 100644 (file)
--- a/drivers/char/rio/rup.h
+++ b/drivers/char/rio/rup.h
@@ -37,19 +37,7 @@
 #ifndef _rup_h
 #define _rup_h 1
 
-#ifdef SCCS_LABELS
-#ifndef lint
-/* static char *_rio_rup_h_sccs = "@(#)rup.h   1.5"; */
-#endif
-#endif
-
-#if defined( HOST ) || defined( INKERNEL )
 #define MAX_RUP          ((short) 16)
-#endif
-#ifdef RTA
-#define MAX_RUP          ((short) 1)
-#endif
-
 #define PKTS_PER_RUP     ((short) 2)   /* They are always used in pairs */
 
 /*************************************************
@@ -65,15 +53,15 @@
 #define RUP_NO_OWNER             0xff  /* RUP not owned by any process */
 
 struct RUP {
-       PKT_ptr txpkt;          /* Outgoing packet */
-       PKT_ptr rxpkt;          /* Incoming packet */
-       WORD link;              /* Which link to send down? */
-       BYTE rup_dest_unit[2];  /* Destination unit */
-       WORD handshake;         /* For handshaking */
-       WORD timeout;           /* Timeout */
-       WORD status;            /* Status */
-       WORD txcontrol;         /* Transmit control */
-       WORD rxcontrol;         /* Receive control */
+       u16 txpkt;              /* Outgoing packet */
+       u16 rxpkt;              /* Incoming packet */
+       u16 link;               /* Which link to send down? */
+       u8 rup_dest_unit[2];    /* Destination unit */
+       u16 handshake;          /* For handshaking */
+       u16 timeout;            /* Timeout */
+       u16 status;             /* Status */
+       u16 txcontrol;          /* Transmit control */
+       u16 rxcontrol;          /* Receive control */
 };
 
 #endif