patch-2.1.6 linux/drivers/isdn/teles/teles.h

• Lines: 46
• Date: Mon Oct 28 21:48:39 1996
• Orig file: v2.1.5/linux/drivers/isdn/teles/teles.h
• Orig date: Sun May 19 15:29:31 1996

diff -u --recursive --new-file v2.1.5/linux/drivers/isdn/teles/teles.h linux/drivers/isdn/teles/teles.h
@@ -14,8 +14,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>
 #include <linux/signal.h>
@@ -28,6 +26,9 @@
 #include <linux/isdnif.h>
 #include <linux/tty.h>
 
+#include <asm/uaccess.h>
+#include <asm/io.h>
+
 #define PH_ACTIVATE   1
 #define PH_DATA       2
 #define PH_DEACTIVATE 3
@@ -306,7 +307,7 @@
 };
 
 struct HscxState {
-	byte           *membase;
+	unsigned int	membase;
 	int             iobase;
 	int             inuse, init, active;
 	struct BufPool  sbufpool, rbufpool, smallpool;
@@ -329,7 +330,7 @@
 #ifdef DEBUG_MAGIC
 	int             magic;
 #endif
-	byte           *membase;
+	unsigned int	membase;
 	int             iobase;
 	struct BufPool  sbufpool, rbufpool, smallpool;
 	struct PStack  *stlist;
@@ -351,7 +352,7 @@
 };
 
 struct IsdnCard {
-	byte           *membase;
+	unsigned int	membase;
 	int             interrupt;
 	unsigned int    iobase;
 	int             protocol;	/* EDSS1 or 1TR6 */