diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 17:26:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 17:26:42 -0400 |
| commit | 07bbc16a8676b06950a21f35b59f69b2fe763bbd (patch) | |
| tree | f87fbfea747e9d92591c8d0a54db7c487e3c3d78 /arch/arm/include/asm/pci.h | |
| parent | 6a9e91846bf52cc70a0417de19fdfac224c435c4 (diff) | |
| parent | f8e256c687eb53850685747757c8d75e58756e15 (diff) | |
Merge branch 'timers/urgent' into x86/xen
Conflicts:
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
Manual merge:
arch/x86/kernel/smpboot.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/include/asm/pci.h')
| -rw-r--r-- | arch/arm/include/asm/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index 721c03d53f4b..918d0cbbf064 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h | |||
| @@ -30,7 +30,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) | |||
| 30 | * The networking and block device layers use this boolean for bounce | 30 | * The networking and block device layers use this boolean for bounce |
| 31 | * buffer decisions. | 31 | * buffer decisions. |
| 32 | */ | 32 | */ |
| 33 | #define PCI_DMA_BUS_IS_PHYS (0) | 33 | #define PCI_DMA_BUS_IS_PHYS (1) |
| 34 | 34 | ||
| 35 | /* | 35 | /* |
| 36 | * Whether pci_unmap_{single,page} is a nop depends upon the | 36 | * Whether pci_unmap_{single,page} is a nop depends upon the |