Merge branch 'master' into for-linus-merged

[~andy/linux] / drivers / char / snsc.h

diff --git a/drivers/char/snsc.h b/drivers/char/snsc.h
index 8a98169b60c1ad42cb240bf71202f30d1f4f1e33..e8c52c882b210aa87b0f76ddaa2ac3e714eb1c53 100644 (file)
--- a/drivers/char/snsc.h
+++ b/drivers/char/snsc.h
@@ -19,11 +19,10 @@
 #include <linux/types.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
-#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