diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-18 05:17:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-18 05:17:17 -0400 |
| commit | a2fe194723f6e4990d01d8c208c7b138fd410522 (patch) | |
| tree | 7aee93fa8f4ba1e18b56fa7d8eab75d249fc6966 /arch/mn10300/mm/dma-alloc.c | |
| parent | c3b7cdf180090d2686239a75bb0ae408108ed749 (diff) | |
| parent | a018540141a931f5299a866907b27886916b4374 (diff) | |
Merge branch 'linus' into perf/core
Pick up the latest ring-buffer fixes, before applying a new fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mn10300/mm/dma-alloc.c')
| -rw-r--r-- | arch/mn10300/mm/dma-alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mn10300/mm/dma-alloc.c b/arch/mn10300/mm/dma-alloc.c index 159acb02cfd4..e244ebe637e1 100644 --- a/arch/mn10300/mm/dma-alloc.c +++ b/arch/mn10300/mm/dma-alloc.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 16 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 17 | #include <linux/gfp.h> | 17 | #include <linux/gfp.h> |
| 18 | #include <linux/export.h> | ||
| 18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 19 | 20 | ||
| 20 | static unsigned long pci_sram_allocated = 0xbc000000; | 21 | static unsigned long pci_sram_allocated = 0xbc000000; |