Merge ../linux-2.6 by hand

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/base/init.c b/drivers/base/init.c
index a76ae5a221f3..c648914b9cde 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();
 }