From f4549adf17ab1879858c7b8655dfe7ef023e404e Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Thu, 20 Apr 2006 00:07:57 -0500
Subject: Include linux/mutex.h not asm/mutex.h in pvrusb2

From: Mike Isely <isely@pobox.com>

The correct mutex header to grab is linux/mutex.h, and while
asm/mutex.h seems to work for x86 architecture, it has been reported
not to work for amd64 architecture.  So let's just do this right.

Signed-off-by: Mike Isely <isely@pobox.com>
---
 linux/drivers/media/video/pvrusb2/pvrusb2-context.h      | 3 +--
 linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 3 +--
 linux/drivers/media/video/pvrusb2/pvrusb2-io.c           | 3 +--
 linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c       | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'linux')

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-context.h b/linux/drivers/media/video/pvrusb2/pvrusb2-context.h
index 910086ba2..69c1f3a92 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-context.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-context.h
@@ -22,8 +22,7 @@
 
 #include "compat.h"
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#include <asm/atomic.h>
-#include <asm/mutex.h>
+#include <linux/mutex.h>
 #else
 #include <asm/semaphore.h>
 #endif
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index abf2faf10..ee0885ef1 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -37,8 +37,7 @@
 #include <linux/videodev2.h>
 #include <linux/i2c.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#include <asm/atomic.h>
-#include <asm/mutex.h>
+#include <linux/mutex.h>
 #else
 #include <asm/semaphore.h>
 #endif
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-io.c b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
index a6bc3befe..cb0ca6376 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -26,8 +26,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#include <asm/atomic.h>
-#include <asm/mutex.h>
+#include <linux/mutex.h>
 #else
 #include <asm/semaphore.h>
 #endif
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c
index f81a0c225..555dbbca8 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c
@@ -26,8 +26,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#include <asm/atomic.h>
-#include <asm/mutex.h>
+#include <linux/mutex.h>
 #else
 #include <asm/semaphore.h>
 #endif
-- 
cgit v1.2.3