Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / base / init.c

diff --git a/drivers/base/init.c b/drivers/base/init.c
index fd53f36..c648914 100644 (file)
--- a/drivers/base/init.c
+++ b/drivers/base/init.c
@@ -2,21 +2,16 @@
  *
  * Copyright (c) 2002-3 Patrick Mochel
  * Copyright (c) 2002-3 Open Source Development Labs
- * 
+ *
  * This file is released under the GPLv2
  *
  */
 
 #include <linux/device.h>
 #include <linux/init.h>
+#include <linux/memory.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);
+#include "base.h"
 
 /**
  *     driver_init - initialize driver model.
@@ -33,10 +28,12 @@ void __init driver_init(void)
        classes_init();
        firmware_init();
 
-       /* These are also core pieces, but must come after the 
+       /* These are also core pieces, but must come after the
         * core core pieces.
         */
        platform_bus_init();
        system_bus_init();
        cpu_dev_init();
+       memory_dev_init();
+       attribute_container_init();
 }