git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
serial
/
68328serial.h
diff --git
a/drivers/serial/68328serial.h
b/drivers/serial/68328serial.h
index
d52a8e7
..
58aa215
100644
(file)
--- a/
drivers/serial/68328serial.h
+++ b/
drivers/serial/68328serial.h
@@
-11,7
+11,6
@@
#ifndef _MC683XX_SERIAL_H
#define _MC683XX_SERIAL_H
#ifndef _MC683XX_SERIAL_H
#define _MC683XX_SERIAL_H
-#include <linux/config.h>
struct serial_struct {
int type;
struct serial_struct {
int type;
@@
-22,11
+21,11
@@
struct serial_struct {
int xmit_fifo_size;
int custom_divisor;
int baud_base;
int xmit_fifo_size;
int custom_divisor;
int baud_base;
- unsigned
int
close_delay;
+ unsigned
short
close_delay;
char reserved_char[2];
int hub6; /* FIXME: We don't have AT&T Hub6 boards! */
char reserved_char[2];
int hub6; /* FIXME: We don't have AT&T Hub6 boards! */
- unsigned
int
closing_wait; /* time to wait before closing */
- unsigned
int
closing_wait2; /* no longer used... */
+ unsigned
short
closing_wait; /* time to wait before closing */
+ unsigned
short
closing_wait2; /* no longer used... */
int reserved[4];
};
int reserved[4];
};
@@
-148,8
+147,8
@@
struct m68k_serial {
int custom_divisor;
int x_char; /* xon/xoff character */
int close_delay;
int custom_divisor;
int x_char; /* xon/xoff character */
int close_delay;
- unsigned
int
closing_wait;
- unsigned
int
closing_wait2;
+ unsigned
short
closing_wait;
+ unsigned
short
closing_wait2;
unsigned long event;
unsigned long last_active;
int line;
unsigned long event;
unsigned long last_active;
int line;