Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / telephony / ixj.h

diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h
index 51e3f7f6597b2dfba83ecc26bb23dbe95408e43c..4c32a43b791473eb7a7cda625f5ff3bcffb95668 100644 (file)
--- a/drivers/telephony/ixj.h
+++ b/drivers/telephony/ixj.h
@@ -40,7 +40,6 @@
  *****************************************************************************/
 #define IXJ_VERSION 3031
 
-#include <linux/version.h>
 #include <linux/types.h>
 
 #include <linux/ixjuser.h>
@@ -49,15 +48,11 @@
 typedef __u16 WORD;
 typedef __u32 DWORD;
 typedef __u8 BYTE;
-typedef __u8 BOOL;
 
 #ifndef IXJMAX
 #define IXJMAX 16
 #endif
 
-#define TRUE 1
-#define FALSE 0
-
 /******************************************************************************
 *
 *  This structure when unioned with the structures below makes simple byte
@@ -1296,7 +1291,7 @@ typedef struct {
        Proc_Info_Type Info_write;
        unsigned short frame_count;
        unsigned int filter_hist[4];
-       unsigned char filter_en[4];
+       unsigned char filter_en[6];
        unsigned short proc_load;
        unsigned long framesread;
        unsigned long frameswritten;