---

yaml --- r: 11391 b: refs/heads/master c: 3947be1 h: refs/heads/master i: 11389: 8da02db 11387: 0f0acd5 11383: c2d4545 11375: e0848ba 11359: 894d85e 11327: 2324417 11263: 64a15b2 v: v3
git-mirror · Oct 30, 2005 · ca85b3a · ca85b3a
1 parent 5023476
commit ca85b3a
Show file tree

Hide file tree

Showing 11 changed files with 778 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdc8cb984576ab5b550c8b24c6fa111a873503e3
+refs/heads/master: 3947be1969a9ce455ec30f60ef51efb10e4323d1
diff --git a/trunk/drivers/base/Makefile b/trunk/drivers/base/Makefile
@@ -7,6 +7,7 @@ obj-y			:= core.o sys.o bus.o dd.o \
 obj-y			+= power/
 obj-$(CONFIG_FW_LOADER)	+= firmware_class.o
 obj-$(CONFIG_NUMA)	+= node.o
+obj-$(CONFIG_MEMORY_HOTPLUG) += memory.o
 
 ifeq ($(CONFIG_DEBUG_DRIVER),y)
 EXTRA_CFLAGS += -DDEBUG

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