Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[~andy/linux] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index dc3429e2eb0f07fe2b8523e0cbaceeb07347a779..1a060265aceae6f31b2875d86f660dc9baaee1ab 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -20,7 +20,7 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pm.h>
-#include <asm/semaphore.h>
+#include <linux/semaphore.h>
 #include <asm/atomic.h>
 #include <asm/device.h>