From 4c5c40f07b052304225a7dfa1b8a636605274a8d Mon Sep 17 00:00:00 2001
From: Dave Young <hidave.darkstar@gmail.com>
Date: Thu, 26 Jul 2007 14:53:53 +0000
Subject: [PATCH] --- yaml --- r: 67952 b: refs/heads/master c:
 869512ab5ab93e5e82ad7d4aaf4ed098d23bfc3f h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/sysfs/bin.c     | 2 +-
 trunk/fs/sysfs/dir.c     | 2 +-
 trunk/fs/sysfs/group.c   | 1 -
 trunk/fs/sysfs/inode.c   | 1 -
 trunk/fs/sysfs/mount.c   | 1 -
 trunk/fs/sysfs/symlink.c | 2 +-
 7 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 51a647304bc3..a0ddd2375d39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52e8c209d6d2bae6766b9940a107c73e943583f1
+refs/heads/master: 869512ab5ab93e5e82ad7d4aaf4ed098d23bfc3f
diff --git a/trunk/fs/sysfs/bin.c b/trunk/fs/sysfs/bin.c
index 5afe2a26f5d8..a819a7e8d74d 100644
--- a/trunk/fs/sysfs/bin.c
+++ b/trunk/fs/sysfs/bin.c
@@ -14,9 +14,9 @@
 #include <linux/kobject.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/mutex.h>
 
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
 
 #include "sysfs.h"
 
diff --git a/trunk/fs/sysfs/dir.c b/trunk/fs/sysfs/dir.c
index ea33b660ae8a..86d75e08de60 100644
--- a/trunk/fs/sysfs/dir.c
+++ b/trunk/fs/sysfs/dir.c
@@ -11,7 +11,7 @@
 #include <linux/namei.h>
 #include <linux/idr.h>
 #include <linux/completion.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 #include "sysfs.h"
 
 DEFINE_MUTEX(sysfs_mutex);
diff --git a/trunk/fs/sysfs/group.c b/trunk/fs/sysfs/group.c
index f318b73c790c..e6b904d71633 100644
--- a/trunk/fs/sysfs/group.c
+++ b/trunk/fs/sysfs/group.c
@@ -14,7 +14,6 @@
 #include <linux/namei.h>
 #include <linux/err.h>
 #include <linux/fs.h>
-#include <asm/semaphore.h>
 #include "sysfs.h"
 
 
diff --git a/trunk/fs/sysfs/inode.c b/trunk/fs/sysfs/inode.c
index 10d1b52899f1..aecb6e771e2a 100644
--- a/trunk/fs/sysfs/inode.c
+++ b/trunk/fs/sysfs/inode.c
@@ -14,7 +14,6 @@
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
-#include <asm/semaphore.h>
 #include "sysfs.h"
 
 extern struct super_block * sysfs_sb;
diff --git a/trunk/fs/sysfs/mount.c b/trunk/fs/sysfs/mount.c
index fbc7b65fe262..69a73ae307fe 100644
--- a/trunk/fs/sysfs/mount.c
+++ b/trunk/fs/sysfs/mount.c
@@ -8,7 +8,6 @@
 #include <linux/mount.h>
 #include <linux/pagemap.h>
 #include <linux/init.h>
-#include <asm/semaphore.h>
 
 #include "sysfs.h"
 
diff --git a/trunk/fs/sysfs/symlink.c b/trunk/fs/sysfs/symlink.c
index 4ce687f0b5d0..90484533801e 100644
--- a/trunk/fs/sysfs/symlink.c
+++ b/trunk/fs/sysfs/symlink.c
@@ -7,7 +7,7 @@
 #include <linux/module.h>
 #include <linux/kobject.h>
 #include <linux/namei.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 #include "sysfs.h"