Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[mv-sheeva.git] / drivers / s390 / char / vmcp.h

diff --git a/drivers/s390/char/vmcp.h b/drivers/s390/char/vmcp.h
index 8a5975f3dad7ce7b7e1442d1cfa32993329edb01..6a993948e188c3a0219832757fd51922d8dab665 100644 (file)
--- a/drivers/s390/char/vmcp.h
+++ b/drivers/s390/char/vmcp.h
@@ -12,8 +12,8 @@
  * The idea of this driver is based on cpint from Neale Ferguson
  */
 
-#include <asm/semaphore.h>
 #include <linux/ioctl.h>
+#include <linux/mutex.h>
 
 #define VMCP_GETCODE _IOR(0x10, 1, int)
 #define VMCP_SETBUF _IOW(0x10, 2, int)
@@ -26,5 +26,5 @@ struct vmcp_session {
        int resp_code;
        /* As we use copy_from/to_user, which might     *
         * sleep and cannot use a spinlock              */
-       struct semaphore mutex;
+       struct mutex mutex;
 };