diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:03:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:03:38 -0500 |
| commit | 90accd6fabf9b2fa2705945a4c601877a75d43bf (patch) | |
| tree | d393cb54f0228b1313139e4e14adf4f5cf236b59 /arch/cris/arch-v10/kernel/dma.c | |
| parent | b43d196c4d3fe46d6dda7c987c47792612b80b1b (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/cris/arch-v10/kernel/dma.c')
| -rw-r--r-- | arch/cris/arch-v10/kernel/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/dma.c b/arch/cris/arch-v10/kernel/dma.c index eb1fa0d2b49f..929e68666299 100644 --- a/arch/cris/arch-v10/kernel/dma.c +++ b/arch/cris/arch-v10/kernel/dma.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include <linux/errno.h> | 7 | #include <linux/errno.h> |
| 8 | 8 | ||
| 9 | #include <asm/dma.h> | 9 | #include <asm/dma.h> |
| 10 | #include <asm/arch/svinto.h> | 10 | #include <arch/svinto.h> |
| 11 | 11 | ||
| 12 | /* Macro to access ETRAX 100 registers */ | 12 | /* Macro to access ETRAX 100 registers */ |
| 13 | #define SETS(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \ | 13 | #define SETS(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \ |