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
/
crisv10.h
diff --git
a/drivers/serial/crisv10.h
b/drivers/serial/crisv10.h
index
1800c0e
..
4a23340
100644
(file)
--- a/
drivers/serial/crisv10.h
+++ b/
drivers/serial/crisv10.h
@@
-7,7
+7,6
@@
#ifndef _ETRAX_SERIAL_H
#define _ETRAX_SERIAL_H
#ifndef _ETRAX_SERIAL_H
#define _ETRAX_SERIAL_H
-#include <linux/config.h>
#include <linux/circ_buf.h>
#include <asm/termios.h>
#include <linux/circ_buf.h>
#include <asm/termios.h>
@@
-94,8
+93,8
@@
struct e100_serial {
struct work_struct work;
struct async_icount icount; /* error-statistics etc.*/
struct work_struct work;
struct async_icount icount; /* error-statistics etc.*/
- struct
termios
normal_termios;
- struct
termios
callout_termios;
+ struct
ktermios
normal_termios;
+ struct
ktermios
callout_termios;
#ifdef DECLARE_WAITQUEUE
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;
#ifdef DECLARE_WAITQUEUE
wait_queue_head_t open_wait;
wait_queue_head_t close_wait;