Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...

[sfrench/cifs-2.6.git] / drivers / char / snsc.h

diff --git a/drivers/char/snsc.h b/drivers/char/snsc.h
index 8a98169b60c1ad42cb240bf71202f30d1f4f1e33..4be62eda9fbc6ddac0522e8d321b7afd1bba015a 100644 (file)
--- a/drivers/char/snsc.h
+++ b/drivers/char/snsc.h
@@ -22,8 +22,8 @@
 #include <linux/kobject.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
+#include <linux/semaphore.h>
 #include <asm/sn/types.h>
-#include <asm/semaphore.h>
 
 #define CHUNKSIZE 127