vga16fb, drm: vga16fb->drm handoff

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

diff --git a/include/linux/isicom.h b/include/linux/isicom.h
index ba5291a..b92e056 100644 (file)
--- a/include/linux/isicom.h
+++ b/include/linux/isicom.h
@@ -1,15 +1,10 @@
 #ifndef _LINUX_ISICOM_H
 #define _LINUX_ISICOM_H
 
-/*#define              ISICOM_DEBUG*/
-/*#define              ISICOM_DEBUG_DTR_RTS*/
-
-#ifdef __KERNEL__
-
 #define                YES     1
 #define                NO      0
 
-/*     
+/*
  *  ISICOM Driver definitions ...
  *
  */
@@ -20,8 +15,8 @@
  *      PCI definitions
  */
 
- #define        DEVID_COUNT     9
- #define        VENDOR_ID       0x10b5
+#define                DEVID_COUNT     9
+#define                VENDOR_ID       0x10b5
 
 /*
  *     These are now officially allocated numbers
@@ -31,14 +26,12 @@
 #define                ISICOM_CMAJOR   113     /* callout */
 #define                ISICOM_MAGIC    (('M' << 8) | 'T')
 
-#define                WAKEUP_CHARS    256     /* hard coded for now   */ 
-#define                TX_SIZE         254 
- 
+#define                WAKEUP_CHARS    256     /* hard coded for now   */
+#define                TX_SIZE         254
+
 #define                BOARD_COUNT     4
 #define                PORT_COUNT      (BOARD_COUNT*16)
 
-#define                SERIAL_TYPE_NORMAL      1
-
 /*   character sizes  */
 
 #define                ISICOM_CS5              0x0000
@@ -66,14 +59,15 @@
 #define        BOARD(line)  (((line) >> 4) & 0x3)
 
        /*      isi kill queue bitmap   */
-       
+
 #define                ISICOM_KILLTX           0x01
 #define                ISICOM_KILLRX           0x02
 
        /* isi_board status bitmap */
-       
+
 #define                FIRMWARE_LOADED         0x0001
 #define                BOARD_ACTIVE            0x0002
+#define                BOARD_INIT              0x0004
 
        /* isi_port status bitmap  */
 
@@ -85,9 +79,6 @@
 #define                ISI_RTS                 0x0200
 
 
-#define                ISI_TXOK                0x0001 
- 
-#endif /*      __KERNEL__      */
+#define                ISI_TXOK                0x0001
 
 #endif /*      ISICOM_H        */
-