Merge branch 'upstream-fixes'

[cascardo/linux.git] / drivers / isdn / hisax / hisax.h

diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 17cf766..11fe537 100644 (file)
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -10,7 +10,6 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/major.h>
-#include <asm/segment.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
@@ -217,7 +216,7 @@ struct Layer1 {
 #define GROUP_TEI      127
 #define TEI_SAPI       63
 #define CTRL_SAPI      0
-#define PACKET_NOACK   250
+#define PACKET_NOACK   7
 
 /* Layer2 Flags */
 
@@ -397,17 +396,17 @@ struct isar_hw {
 
 struct hdlc_stat_reg {
 #ifdef __BIG_ENDIAN
-       u_char fill __attribute__((packed));
-       u_char mode __attribute__((packed));
-       u_char xml  __attribute__((packed));
-       u_char cmd  __attribute__((packed));
+       u_char fill;
+       u_char mode;
+       u_char xml;
+       u_char cmd;
 #else
-       u_char cmd  __attribute__((packed));
-       u_char xml  __attribute__((packed));
-       u_char mode __attribute__((packed));
-       u_char fill __attribute__((packed));
+       u_char cmd;
+       u_char xml;
+       u_char mode;
+       u_char fill;
 #endif
-};
+} __attribute__((packed));
 
 struct hdlc_hw {
        union {
@@ -1242,6 +1241,8 @@ struct IsdnCardState {
 
 #ifdef CONFIG_HISAX_ENTERNOW_PCI
 #define CARD_FN_ENTERNOW_PCI 1
+#else
+#define CARD_FN_ENTERNOW_PCI 0
 #endif
 
 #define TEI_PER_CARD 1