From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 28 Nov 2008 21:10:06 +0000 (+0000)
Subject: [ARM] ixp23xx: mach/io.h doesn't need BUG() anymore
X-Git-Tag: v2.6.29-rc1~559^2~67
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=32643fe633ce1c9c892bceee35cd0d137d71bae5;p=~emulex%2Finfiniband.git

[ARM] ixp23xx: mach/io.h doesn't need BUG() anymore

ixp23xx's mach/io.h claims to need linux/kernel.h for BUG().
However, this header doesn't make use of BUG().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-ixp23xx/include/mach/io.h b/arch/arm/mach-ixp23xx/include/mach/io.h
index 305ea1808c7..fd9ef8e519f 100644
--- a/arch/arm/mach-ixp23xx/include/mach/io.h
+++ b/arch/arm/mach-ixp23xx/include/mach/io.h
@@ -20,8 +20,6 @@
 #define __io(p)		((void __iomem*)((p) + IXP23XX_PCI_IO_VIRT))
 #define __mem_pci(a)	(a)
 
-#include <linux/kernel.h>	/* For BUG */
-
 static inline void __iomem *
 ixp23xx_ioremap(unsigned long addr, unsigned long size, unsigned int mtype)
 {