1 files changed, 54 insertions, 54 deletions
diff --git a/drivers/char/epca.h b/drivers/char/epca.h
index 52205ef71314..20eeb5a70e1a 100644
--- a/drivers/char/epca.h
+++ b/drivers/char/epca.h
@@ -85,73 +85,73 @@ static char *board_desc[] =
 struct channel 
 {
        long   magic;
-        unchar boardnum;
+        unsigned char boardnum;
-        unchar channelnum;
+        unsigned char channelnum;
-        unchar omodem;         /* FEP output modem status     */
+        unsigned char omodem;         /* FEP output modem status     */
-        unchar imodem;         /* FEP input modem status      */
+        unsigned char imodem;         /* FEP input modem status      */
-        unchar modemfake;      /* Modem values to be forced   */
+        unsigned char modemfake;      /* Modem values to be forced   */
-        unchar modem;          /* Force values                */
+        unsigned char modem;          /* Force values                */
-        unchar hflow;
+        unsigned char hflow;
-        unchar dsr;
+        unsigned char dsr;
-        unchar dcd;
+        unsigned char dcd;
-        unchar m_rts ;          /* The bits used in whatever FEP */
+        unsigned char m_rts ;           /* The bits used in whatever FEP */
-        unchar m_dcd ;          /* is indiginous to this board to */
+        unsigned char m_dcd ;           /* is indiginous to this board to */
-        unchar m_dsr ;          /* represent each of the physical */
+        unsigned char m_dsr ;           /* represent each of the physical */
-        unchar m_cts ;          /* handshake lines */
+        unsigned char m_cts ;           /* handshake lines */
-        unchar m_ri ;
+        unsigned char m_ri ;
-        unchar m_dtr ;
+        unsigned char m_dtr ;
-        unchar stopc;
+        unsigned char stopc;
-        unchar startc;
+        unsigned char startc;
-        unchar stopca;
+        unsigned char stopca;
-        unchar startca;
+        unsigned char startca;
-        unchar fepstopc;
+        unsigned char fepstopc;
-        unchar fepstartc;
+        unsigned char fepstartc;
-        unchar fepstopca;
+        unsigned char fepstopca;
-        unchar fepstartca;
+        unsigned char fepstartca;
-        unchar txwin;
+        unsigned char txwin;
-        unchar rxwin;
+        unsigned char rxwin;
-        ushort fepiflag;
+        unsigned short fepiflag;
-        ushort fepcflag;
+        unsigned short fepcflag;
-        ushort fepoflag;
+        unsigned short fepoflag;
-        ushort txbufhead;
+        unsigned short txbufhead;
-        ushort txbufsize;
+        unsigned short txbufsize;
-        ushort rxbufhead;
+        unsigned short rxbufhead;
-        ushort rxbufsize;
+        unsigned short rxbufsize;
        int    close_delay;
        int    count;
        int    blocked_open;
-        ulong  event;
+        unsigned long  event;
        int    asyncflags;
        uint   dev;
-        ulong  statusflags;
+        unsigned long  statusflags;
-        ulong  c_iflag;
+        unsigned long  c_iflag;
-        ulong  c_cflag;
+        unsigned long  c_cflag;
-        ulong  c_lflag;
+        unsigned long  c_lflag;
-        ulong  c_oflag;
+        unsigned long  c_oflag;
-        unchar *txptr;
+        unsigned char *txptr;
-        unchar *rxptr;
+        unsigned char *rxptr;
-        unchar *tmp_buf;
+        unsigned char *tmp_buf;
        struct board_info           *board;
-        volatile struct board_chan  *brdchan;
+        struct board_chan           *brdchan;
        struct digi_struct          digiext;
        struct tty_struct           *tty;
        wait_queue_head_t           open_wait;
        wait_queue_head_t           close_wait;
-        struct work_struct            tqueue;
+        struct work_struct          tqueue;
-        volatile struct global_data *mailbox;
+        struct global_data          *mailbox;
 };
 struct board_info       
 {
-        unchar status;
+        unsigned char status;
-        unchar type;
+        unsigned char type;
-        unchar altpin;
+        unsigned char altpin;
-        ushort numports;
+        unsigned short numports;
-        unchar *port;
+        unsigned long port;
-        unchar *membase;
+        unsigned long membase;
-        unchar __iomem *re_map_port;
+        unsigned char __iomem *re_map_port;
-        unchar *re_map_membase;
+        unsigned char *re_map_membase;
-        ulong  memory_seg;
+        unsigned long  memory_seg;
        void ( * memwinon )     (struct board_info *, unsigned int) ;
        void ( * memwinoff )    (struct board_info *, unsigned int) ;
        void ( * globalwinon )  (struct channel *) ;
@@ -160,6 +160,6 @@ struct board_info
        void ( * memoff )       (struct channel *) ;
        void ( * assertgwinon ) (struct channel *) ;
        void ( * assertmemoff ) (struct channel *) ;
-        unchar poller_inhibited ;
+        unsigned char poller_inhibited ;
 };

diff --git a/drivers/char/epca.h b/drivers/char/epca.h index 52205ef71314..20eeb5a70e1a 100644 --- a/drivers/char/epca.h +++ b/drivers/char/epca.h
@@ -85,73 +85,73 @@ static char *board_desc[] =
85	struct channel	85	struct channel
86	{	86	{
87	long magic;	87	long magic;
88	unchar boardnum;	88	unsigned char boardnum;
89	unchar channelnum;	89	unsigned char channelnum;
90	unchar omodem; /* FEP output modem status */	90	unsigned char omodem; /* FEP output modem status */
91	unchar imodem; /* FEP input modem status */	91	unsigned char imodem; /* FEP input modem status */
92	unchar modemfake; /* Modem values to be forced */	92	unsigned char modemfake; /* Modem values to be forced */
93	unchar modem; /* Force values */	93	unsigned char modem; /* Force values */
94	unchar hflow;	94	unsigned char hflow;
95	unchar dsr;	95	unsigned char dsr;
96	unchar dcd;	96	unsigned char dcd;
97	unchar m_rts ; /* The bits used in whatever FEP */	97	unsigned char m_rts ; /* The bits used in whatever FEP */
98	unchar m_dcd ; /* is indiginous to this board to */	98	unsigned char m_dcd ; /* is indiginous to this board to */
99	unchar m_dsr ; /* represent each of the physical */	99	unsigned char m_dsr ; /* represent each of the physical */
100	unchar m_cts ; /* handshake lines */	100	unsigned char m_cts ; /* handshake lines */
101	unchar m_ri ;	101	unsigned char m_ri ;
102	unchar m_dtr ;	102	unsigned char m_dtr ;
103	unchar stopc;	103	unsigned char stopc;
104	unchar startc;	104	unsigned char startc;
105	unchar stopca;	105	unsigned char stopca;
106	unchar startca;	106	unsigned char startca;
107	unchar fepstopc;	107	unsigned char fepstopc;
108	unchar fepstartc;	108	unsigned char fepstartc;
109	unchar fepstopca;	109	unsigned char fepstopca;
110	unchar fepstartca;	110	unsigned char fepstartca;
111	unchar txwin;	111	unsigned char txwin;
112	unchar rxwin;	112	unsigned char rxwin;
113	ushort fepiflag;	113	unsigned short fepiflag;
114	ushort fepcflag;	114	unsigned short fepcflag;
115	ushort fepoflag;	115	unsigned short fepoflag;
116	ushort txbufhead;	116	unsigned short txbufhead;
117	ushort txbufsize;	117	unsigned short txbufsize;
118	ushort rxbufhead;	118	unsigned short rxbufhead;
119	ushort rxbufsize;	119	unsigned short rxbufsize;
120	int close_delay;	120	int close_delay;
121	int count;	121	int count;
122	int blocked_open;	122	int blocked_open;
123	ulong event;	123	unsigned long event;
124	int asyncflags;	124	int asyncflags;
125	uint dev;	125	uint dev;
126	ulong statusflags;	126	unsigned long statusflags;
127	ulong c_iflag;	127	unsigned long c_iflag;
128	ulong c_cflag;	128	unsigned long c_cflag;
129	ulong c_lflag;	129	unsigned long c_lflag;
130	ulong c_oflag;	130	unsigned long c_oflag;
131	unchar *txptr;	131	unsigned char *txptr;
132	unchar *rxptr;	132	unsigned char *rxptr;
133	unchar *tmp_buf;	133	unsigned char *tmp_buf;
134	struct board_info *board;	134	struct board_info *board;
135	volatile struct board_chan *brdchan;	135	struct board_chan *brdchan;
136	struct digi_struct digiext;	136	struct digi_struct digiext;
137	struct tty_struct *tty;	137	struct tty_struct *tty;
138	wait_queue_head_t open_wait;	138	wait_queue_head_t open_wait;
139	wait_queue_head_t close_wait;	139	wait_queue_head_t close_wait;
140	struct work_struct tqueue;	140	struct work_struct tqueue;
141	volatile struct global_data *mailbox;	141	struct global_data *mailbox;
142	};	142	};
143		143
144	struct board_info	144	struct board_info
145	{	145	{
146	unchar status;	146	unsigned char status;
147	unchar type;	147	unsigned char type;
148	unchar altpin;	148	unsigned char altpin;
149	ushort numports;	149	unsigned short numports;
150	unchar *port;	150	unsigned long port;
151	unchar *membase;	151	unsigned long membase;
152	unchar __iomem *re_map_port;	152	unsigned char __iomem *re_map_port;
153	unchar *re_map_membase;	153	unsigned char *re_map_membase;
154	ulong memory_seg;	154	unsigned long memory_seg;
155	void ( * memwinon ) (struct board_info *, unsigned int) ;	155	void ( * memwinon ) (struct board_info *, unsigned int) ;
156	void ( * memwinoff ) (struct board_info *, unsigned int) ;	156	void ( * memwinoff ) (struct board_info *, unsigned int) ;
157	void ( * globalwinon ) (struct channel *) ;	157	void ( * globalwinon ) (struct channel *) ;
@@ -160,6 +160,6 @@ struct board_info
160	void ( * memoff ) (struct channel *) ;	160	void ( * memoff ) (struct channel *) ;
161	void ( * assertgwinon ) (struct channel *) ;	161	void ( * assertgwinon ) (struct channel *) ;
162	void ( * assertmemoff ) (struct channel *) ;	162	void ( * assertmemoff ) (struct channel *) ;
163	unchar poller_inhibited ;	163	unsigned char poller_inhibited ;
164	};	164	};
165		165