diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-14 03:11:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-14 03:11:46 -0400 |
| commit | ed859ed3b0f9893c6bce3708e8928341c15699b9 (patch) | |
| tree | 59c507f00bc13becb4accdd64fdc01ece08b4645 /arch/arm/mach-ixp4xx/include/mach/hardware.h | |
| parent | a8027073eb127cd207070891374b5c54c2ce3d23 (diff) | |
| parent | 53eeb64e808971207350386121f4bab12fa2f45f (diff) | |
Merge branch 'linus' into sched/core
Merge reason: update from -rc5 to -almost-final
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-ixp4xx/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/hardware.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/hardware.h b/arch/arm/mach-ixp4xx/include/mach/hardware.h index f91ca6d4fbe8..8138371c406e 100644 --- a/arch/arm/mach-ixp4xx/include/mach/hardware.h +++ b/arch/arm/mach-ixp4xx/include/mach/hardware.h | |||
| @@ -26,6 +26,8 @@ | |||
| 26 | #define PCIBIOS_MAX_MEM 0x4BFFFFFF | 26 | #define PCIBIOS_MAX_MEM 0x4BFFFFFF |
| 27 | #endif | 27 | #endif |
| 28 | 28 | ||
| 29 | #define ARCH_HAS_DMA_SET_COHERENT_MASK | ||
| 30 | |||
| 29 | #define pcibios_assign_all_busses() 1 | 31 | #define pcibios_assign_all_busses() 1 |
| 30 | 32 | ||
| 31 | /* Register locations and bits */ | 33 | /* Register locations and bits */ |