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/slip_user.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/um/drivers/slip_user.c')
| -rw-r--r-- | arch/um/drivers/slip_user.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c index 71af444e591f..89fbec185cc1 100644 --- a/arch/um/drivers/slip_user.c +++ b/arch/um/drivers/slip_user.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include "net_user.h" | 14 | #include "net_user.h" |
| 15 | #include "slip.h" | 15 | #include "slip.h" |
| 16 | #include "slip_common.h" | 16 | #include "slip_common.h" |
| 17 | #include "helper.h" | ||
| 18 | #include "os.h" | 17 | #include "os.h" |
| 19 | 18 | ||
| 20 | void slip_user_init(void *data, void *dev) | 19 | void slip_user_init(void *data, void *dev) |