From d64a7e0d4d7b9e8665cea162c811538404e57a0d Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Sun, 8 May 2011 16:41:45 -0700
Subject: [PATCH] --- yaml --- r: 247920 b: refs/heads/master c:
 245e37182b7dead255bdc9e333e0bcc128360675 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/ide.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 68565b72ee01..f3a93ece9d3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f17bfe79e6aa34aecbd579258a5c55a790807aca
+refs/heads/master: 245e37182b7dead255bdc9e333e0bcc128360675
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index 072fe8c93e6f..42557851b12e 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -18,13 +18,13 @@
 #include <linux/pci.h>
 #include <linux/completion.h>
 #include <linux/pm.h>
+#include <linux/mutex.h>
 #ifdef CONFIG_BLK_DEV_IDEACPI
 #include <acpi/acpi.h>
 #endif
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/mutex.h>
 
 /* for request_sense */
 #include <linux/cdrom.h>