diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:28 -0500 |
| commit | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch) | |
| tree | 0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /arch/frv | |
| parent | 0d688da5505d77bcef2441e0a22d8cc26459702d (diff) | |
| parent | 559595a985e106d2fa9f0c79b7f5805453fed593 (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/mm/dma-alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/mm/dma-alloc.c b/arch/frv/mm/dma-alloc.c index dc6522c464d4..44840e73e907 100644 --- a/arch/frv/mm/dma-alloc.c +++ b/arch/frv/mm/dma-alloc.c | |||
| @@ -36,10 +36,10 @@ | |||
| 36 | #include <linux/vmalloc.h> | 36 | #include <linux/vmalloc.h> |
| 37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 38 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
| 39 | #include <linux/hardirq.h> | ||
| 39 | 40 | ||
| 40 | #include <asm/pgalloc.h> | 41 | #include <asm/pgalloc.h> |
| 41 | #include <asm/io.h> | 42 | #include <asm/io.h> |
| 42 | #include <asm/hardirq.h> | ||
| 43 | #include <asm/mmu_context.h> | 43 | #include <asm/mmu_context.h> |
| 44 | #include <asm/pgtable.h> | 44 | #include <asm/pgtable.h> |
| 45 | #include <asm/mmu.h> | 45 | #include <asm/mmu.h> |