[PATCH] i2c-i801: I2C patch for Intel ICH8

[linux-2.6] / drivers / base / memory.c

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 19fe93155fe6ed0314347313063f58e6b5dbf564..d1a05224627ed36aec464213ac302e8c5494982b 100644 (file)
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -13,8 +13,8 @@
 #include <linux/sysdev.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/sched.h>       /* capable() */
 #include <linux/topology.h>
+#include <linux/capability.h>
 #include <linux/device.h>
 #include <linux/memory.h>
 #include <linux/kobject.h>
@@ -62,8 +62,7 @@ void unregister_memory_notifier(struct notifier_block *nb)
 /*
  * register_memory - Setup a sysfs device for a memory block
  */
-static int
-register_memory(struct memory_block *memory, struct mem_section *section,
+int register_memory(struct memory_block *memory, struct mem_section *section,
                struct node *root)
 {
        int error;