diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /arch/um/drivers/port_user.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/um/drivers/port_user.c')
| -rw-r--r-- | arch/um/drivers/port_user.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c index 14dd2002d2da..ed4a1a6c5d83 100644 --- a/arch/um/drivers/port_user.c +++ b/arch/um/drivers/port_user.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include "user.h" | 18 | #include "user.h" |
| 19 | #include "chan_user.h" | 19 | #include "chan_user.h" |
| 20 | #include "port.h" | 20 | #include "port.h" |
| 21 | #include "helper.h" | ||
| 22 | #include "os.h" | 21 | #include "os.h" |
| 23 | 22 | ||
| 24 | struct port_chan { | 23 | struct port_chan { |