Pull platform-drivers into test branch

[pandora-kernel.git] / drivers / telephony / ixj.h

diff --git a/drivers/telephony/ixj.h b/drivers/telephony/ixj.h
index 51e3f7f..8d69bcd 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>
@@ -1296,7 +1295,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;