From da57f358e4b7241e9243e7f075632b200e6c911e Mon Sep 17 00:00:00 2001
From: Jon Mason <jdmason@us.ibm.com>
Date: Wed, 3 May 2006 17:26:58 -0500
Subject: [PATCH] --- yaml --- r: 26555 b: refs/heads/master c:
 913ed41eb5c948d2f8b5deffd29c2638eceef3d7 h: refs/heads/master i:   26553:
 3186a943a48dd42075b23ead454e47ae3c52d88a   26551:
 fc6783055d0326183feb4ab276846ba14e825144 v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-ia64/bitops.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 50a277795cc3..8921e8e6186f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e6e155646706f1ef9f791a4402d145f112a3f8d
+refs/heads/master: 913ed41eb5c948d2f8b5deffd29c2638eceef3d7
diff --git a/trunk/include/asm-ia64/bitops.h b/trunk/include/asm-ia64/bitops.h
index 90921e162793..6cc517e212a9 100644
--- a/trunk/include/asm-ia64/bitops.h
+++ b/trunk/include/asm-ia64/bitops.h
@@ -11,7 +11,6 @@
 
 #include <linux/compiler.h>
 #include <linux/types.h>
-#include <asm/bitops.h>
 #include <asm/intrinsics.h>
 
 /**