Manual merge with Linus.

[cascardo/linux.git] / drivers / base / sys.c

diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 3431eb6..6fc23ab 100644 (file)
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -21,6 +21,10 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/pm.h>
+#include <linux/device.h>
+#include <asm/semaphore.h>
+
+#include "base.h"
 
 extern struct subsystem devices_subsys;