summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 23:58:17 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-04 23:58:17 -0800
commitcc5979c373db310084dc03b4cba091840dda2491 (patch)
tree5bc9a0c0989726fd0ba37078a3a2e673890a2cc6 /init
parent40b1df3aaf1d7d7258b501baa805fa2c5bb2692b (diff)
v2.5.0.4 -> v2.5.0.5
- Patrick Mochel: driver model infrastructure, part 1 - Jens Axboe: more bio fixes, cleanups - Andrew Morton: release locking fixes - Al Viro: superblock/mount handling - Kai Germaschewski: AVM Fritz!Card ISDN driver - Christoph Hellwig: make cramfs SMP-safe.
Diffstat (limited to 'init')
-rw-r--r--init/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c
index 8a1e43209bfb..b0e3304513e8 100644
--- a/init/main.c
+++ b/init/main.c
@@ -31,6 +31,8 @@
#include <asm/io.h>
#include <asm/bugs.h>
+#include <linux/device.h>
+
#if defined(CONFIG_ARCH_S390)
#include <asm/s390mach.h>
#include <asm/ccwcache.h>
@@ -694,6 +696,9 @@ static void __init do_basic_setup(void)
s390_init_machine_check();
#endif
+ /* bring up the device tree */
+ device_driver_init();
+
#ifdef CONFIG_PCI
pci_init();
#endif