diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-18 13:21:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-18 13:21:24 -0400 |
| commit | f9d1fe9630b94007902987c39d19f04dc6256eac (patch) | |
| tree | 1fbe757adc72469ddbc3c1e4132392164b2e0271 /arch/um/kernel/main.c | |
| parent | 54258a8a2e81b11e486068f1cfab9fe4746b8420 (diff) | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/um/kernel/main.c')
| -rw-r--r-- | arch/um/kernel/main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/um/kernel/main.c b/arch/um/kernel/main.c index e42e6364ca13..e59f58152678 100644 --- a/arch/um/kernel/main.c +++ b/arch/um/kernel/main.c | |||
| @@ -24,8 +24,6 @@ | |||
| 24 | #include "mode.h" | 24 | #include "mode.h" |
| 25 | #include "choose-mode.h" | 25 | #include "choose-mode.h" |
| 26 | #include "uml-config.h" | 26 | #include "uml-config.h" |
| 27 | #include "irq_user.h" | ||
| 28 | #include "time_user.h" | ||
| 29 | #include "os.h" | 27 | #include "os.h" |
| 30 | 28 | ||
| 31 | /* Set in set_stklim, which is called from main and __wrap_malloc. | 29 | /* Set in set_stklim, which is called from main and __wrap_malloc. |