Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into...

[pandora-kernel.git] / drivers / char / rio / rioinfo.h

diff --git a/drivers/char/rio/rioinfo.h b/drivers/char/rio/rioinfo.h
index e08421c..42ff1e7 100644 (file)
--- a/drivers/char/rio/rioinfo.h
+++ b/drivers/char/rio/rioinfo.h
@@ -33,37 +33,33 @@
 #ifndef __rioinfo_h
 #define __rioinfo_h
 
-#ifdef SCCS_LABELS
-static char *_rioinfo_h_sccs_ = "@(#)rioinfo.h 1.2";
-#endif
-
 /*
 ** Host card data structure
 */
 struct RioHostInfo {
-       long    location;       /* RIO Card Base I/O address */
-       long    vector;         /* RIO Card IRQ vector */
-       int     bus;            /* ISA/EISA/MCA/PCI */
-       int     mode;           /* pointer to host mode - INTERRUPT / POLLED */
+       long location;          /* RIO Card Base I/O address */
+       long vector;            /* RIO Card IRQ vector */
+       int bus;                /* ISA/EISA/MCA/PCI */
+       int mode;               /* pointer to host mode - INTERRUPT / POLLED */
        struct old_sgttyb
-               * Sg;           /* pointer to default term characteristics */
+       *Sg;                    /* pointer to default term characteristics */
 };
 
 
 /* Mode in rio device info */
-#define INTERRUPTED_MODE       0x01            /* Interrupt is generated */
-#define POLLED_MODE            0x02            /* No interrupt */
-#define AUTO_MODE              0x03            /* Auto mode */
+#define INTERRUPTED_MODE       0x01    /* Interrupt is generated */
+#define POLLED_MODE            0x02    /* No interrupt */
+#define AUTO_MODE              0x03    /* Auto mode */
 
-#define WORD_ACCESS_MODE       0x10            /* Word Access Mode */
-#define BYTE_ACCESS_MODE       0x20            /* Byte Access Mode */
+#define WORD_ACCESS_MODE       0x10    /* Word Access Mode */
+#define BYTE_ACCESS_MODE       0x20    /* Byte Access Mode */
 
 
 /* Bus type that RIO supports */
-#define ISA_BUS                        0x01            /* The card is ISA */
-#define EISA_BUS               0x02            /* The card is EISA */
-#define MCA_BUS                        0x04            /* The card is MCA */
-#define PCI_BUS                        0x08            /* The card is PCI */
+#define ISA_BUS                        0x01    /* The card is ISA */
+#define EISA_BUS               0x02    /* The card is EISA */
+#define MCA_BUS                        0x04    /* The card is MCA */
+#define PCI_BUS                        0x08    /* The card is PCI */
 
 /*
 ** 11.11.1998 ARG - ESIL ???? part fix
@@ -93,4 +89,4 @@ struct RioHostInfo {
        'V' - '@'                               /* literal next char */ \
 }
 
-#endif /* __rioinfo_h */
+#endif                         /* __rioinfo_h */