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
Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
hayesesp.h
diff --git
a/include/linux/hayesesp.h
b/include/linux/hayesesp.h
index
938be8e
..
b436be7
100644
(file)
--- a/
include/linux/hayesesp.h
+++ b/
include/linux/hayesesp.h
@@
-88,8
+88,8
@@
struct esp_struct {
int stat_flags;
int custom_divisor;
int close_delay;
int stat_flags;
int custom_divisor;
int close_delay;
- unsigned
int
closing_wait;
- unsigned
int
closing_wait2;
+ unsigned
short
closing_wait;
+ unsigned
short
closing_wait2;
int IER; /* Interrupt Enable Register */
int MCR; /* Modem control register */
unsigned long event;
int IER; /* Interrupt Enable Register */
int MCR; /* Modem control register */
unsigned long event;