USB: tty: sort out the request_room handling for whiteheat

[safe/jmp/linux-2.6] / drivers / usb / serial / io_edgeport.h

diff --git a/drivers/usb/serial/io_edgeport.h b/drivers/usb/serial/io_edgeport.h
index 5112d7a..cb201c1 100644 (file)
--- a/drivers/usb/serial/io_edgeport.h
+++ b/drivers/usb/serial/io_edgeport.h
@@ -19,21 +19,12 @@
 #define MAX_RS232_PORTS                8       /* Max # of RS-232 ports per device */
 
 /* typedefs that the insideout headers need */
-#ifndef TRUE
-       #define TRUE            (1)
-#endif
-#ifndef FALSE
-       #define FALSE           (0)
-#endif
 #ifndef LOW8
        #define LOW8(a)         ((unsigned char)(a & 0xff))
 #endif
 #ifndef HIGH8
        #define HIGH8(a)        ((unsigned char)((a & 0xff00) >> 8))
 #endif
-#ifndef NUM_ENTRIES
-       #define NUM_ENTRIES(x)  (sizeof(x)/sizeof((x)[0]))
-#endif
 
 #ifndef __KERNEL__
 #define __KERNEL__
@@ -114,10 +105,12 @@ struct edgeport_product_info {
        __le16  FirmwareBuildNumber;            /*                              zzzz (LE format) */
 
        __u8    ManufactureDescDate[3];         /* MM/DD/YY when descriptor template was compiled */
-       __u8    Unused1[1];                     /* Available */
+       __u8    HardwareType;
 
        __u8    iDownloadFile;                  /* What to download to EPiC device */
-       __u8    Unused2[2];                     /* Available */
+       __u8    EpicVer;                        /* What version of EPiC spec this device supports */
+
+       struct edge_compatibility_bits Epic;
 };
 
 /*