diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:10:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 19:10:34 -0800 |
| commit | d62f43c548aa4bf76b6206b02f178a3a570d1114 (patch) | |
| tree | b406d711eaef6bf761308df93b0fff9214950b63 /init | |
| parent | adbc4706552e90140e7d5c42b71bbd4a17a6bd4c (diff) | |
v2.4.6.2 -> v2.4.6.3
- merge with Alan (SCSI subsystem)
- Jeff Garzik: make serial driver PCI hotplug-aware
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index e356977156fa..3738697133d4 100644 --- a/init/main.c +++ b/init/main.c @@ -538,8 +538,8 @@ asmlinkage void __init start_kernel(void) trap_init(); init_IRQ(); sched_init(); - time_init(); softirq_init(); + time_init(); /* * HACK ALERT! This is early. We're enabling the console before |