From 6d07cd6257a002bf48faa1b2a6867cfa07f66e67 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 9 Feb 2009 16:47:36 +0000
Subject: [PATCH] --- yaml --- r: 131128 b: refs/heads/master c:
 a8e807f7607ab633de7be4e2f4c350923cc2cb63 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/frv/mm/dma-alloc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d90153cf6bab..2dbdebd53a71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5ef7ca0e2636bad0ccd07b996d775348ae2b65e
+refs/heads/master: a8e807f7607ab633de7be4e2f4c350923cc2cb63
diff --git a/trunk/arch/frv/mm/dma-alloc.c b/trunk/arch/frv/mm/dma-alloc.c
index dc6522c464d4..44840e73e907 100644
--- a/trunk/arch/frv/mm/dma-alloc.c
+++ b/trunk/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>