summaryrefslogtreecommitdiffstats
path: root/drivers/base/init.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-30 21:00:04 +0000
committerAnton Altaparmakov <aia21@cantab.net>2005-10-30 21:00:04 +0000
commit07b188ab773e183871e57b33ae37bf635c9f12ba (patch)
tree311df8a0dd12fb7bd3e9b5b1a5ca500f0428d679 /drivers/base/init.c
parent47c564e10f219f867bdb49225972749a43485a47 (diff)
parent9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (diff)
downloadkernel-crypto-07b188ab773e183871e57b33ae37bf635c9f12ba.tar.gz
kernel-crypto-07b188ab773e183871e57b33ae37bf635c9f12ba.tar.xz
kernel-crypto-07b188ab773e183871e57b33ae37bf635c9f12ba.zip
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/base/init.c')
-rw-r--r--drivers/base/init.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/base/init.c b/drivers/base/init.c
index a76ae5a221f..c648914b9cd 100644
--- a/drivers/base/init.c
+++ b/drivers/base/init.c
@@ -9,15 +9,10 @@
#include <linux/device.h>
#include <linux/init.h>
+#include <linux/memory.h>
+
+#include "base.h"
-extern int devices_init(void);
-extern int buses_init(void);
-extern int classes_init(void);
-extern int firmware_init(void);
-extern int platform_bus_init(void);
-extern int system_bus_init(void);
-extern int cpu_dev_init(void);
-extern int attribute_container_init(void);
/**
* driver_init - initialize driver model.
*
@@ -39,5 +34,6 @@ void __init driver_init(void)
platform_bus_init();
system_bus_init();
cpu_dev_init();
+ memory_dev_init();
attribute_container_init();
}