Merge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil...

[linux-2.6-omap-h63xx.git] / drivers / isdn / hardware / mISDN / hfc_pci.h

diff --git a/drivers/isdn/hardware/mISDN/hfc_pci.h b/drivers/isdn/hardware/mISDN/hfc_pci.h
index fd2c9be6d8492a14076781408735f67c3e9cef47..3132ddc99fcd73fc785a02bcd457332f41e1fd83 100644 (file)
--- a/drivers/isdn/hardware/mISDN/hfc_pci.h
+++ b/drivers/isdn/hardware/mISDN/hfc_pci.h
@@ -26,7 +26,7 @@
  * change mask and threshold simultaneously
  */
 #define HFCPCI_BTRANS_THRESHOLD 128
-#define HFCPCI_BTRANS_MAX      256
+#define HFCPCI_FILLEMPTY       64
 #define HFCPCI_BTRANS_THRESMASK 0x00
 
 /* defines for PCI config */
@@ -183,8 +183,8 @@
 #define D_FREG_MASK  0xF
 
 struct zt {
-       unsigned short z1;  /* Z1 pointer 16 Bit */
-       unsigned short z2;  /* Z2 pointer 16 Bit */
+       __le16 z1;  /* Z1 pointer 16 Bit */
+       __le16 z2;  /* Z2 pointer 16 Bit */
 };
 
 struct dfifo {