summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2009-02-09 16:47:36 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-09 08:51:35 -0800
commita8e807f7607ab633de7be4e2f4c350923cc2cb63 (patch)
tree7d5acad508032b468cae5aa739de318284bf09fb
parenta5ef7ca0e2636bad0ccd07b996d775348ae2b65e (diff)
downloadop-kernel-dev-a8e807f7607ab633de7be4e2f4c350923cc2cb63.zip
op-kernel-dev-a8e807f7607ab633de7be4e2f4c350923cc2cb63.tar.gz
FRV: in_interrupt() requires #inclusion of linux/hardirq.h not asm/hardirq.h now
in_interrupt() requires #inclusion of linux/hardirq.h not asm/hardirq.h now. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/frv/mm/dma-alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/mm/dma-alloc.c b/arch/frv/mm/dma-alloc.c
index dc6522c..44840e7 100644
--- a/arch/frv/mm/dma-alloc.c
+++ b/arch/frv/mm/dma-alloc.c
@@ -36,10 +36,10 @@
#include <linux/vmalloc.h>
#include <linux/init.h>
#include <linux/pci.h>
+#include <linux/hardirq.h>
#include <asm/pgalloc.h>
#include <asm/io.h>
-#include <asm/hardirq.h>
#include <asm/mmu_context.h>
#include <asm/pgtable.h>
#include <asm/mmu.h>
OpenPOWER on IntegriCloud