Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / drivers / base / init.c

diff --git a/drivers/base/init.c b/drivers/base/init.c
index 84e604e..c648914 100644 (file)
--- a/drivers/base/init.c
+++ b/drivers/base/init.c
@@ -9,6 +9,7 @@
 
 #include <linux/device.h>
 #include <linux/init.h>
+#include <linux/memory.h>
 
 #include "base.h"
 
@@ -33,5 +34,6 @@ void __init driver_init(void)
        platform_bus_init();
        system_bus_init();
        cpu_dev_init();
+       memory_dev_init();
        attribute_container_init();
 }