diff options
| author |   Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
| commit | 76467874b83835129dc454e3a7a8e5d1186101b0 (patch) | |
| tree | 162129f0c36c35be4aa323cf00626db0e804c3fc /include/asm-arm/memory.h | |
| parent | [GFS2] Update GFS2 for the recent pull from Linus (diff) | |
| parent | Linux v2.6.17-rc1 (diff) | |
| download | linux-dev-76467874b83835129dc454e3a7a8e5d1186101b0.tar.xz linux-dev-76467874b83835129dc454e3a7a8e5d1186101b0.zip | |
Merge branch 'master'
Diffstat (limited to 'include/asm-arm/memory.h')
| -rw-r--r-- | include/asm-arm/memory.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h index afa5c3ea077c..2b3cf69b3ed9 100644 --- a/include/asm-arm/memory.h +++ b/include/asm-arm/memory.h @@ -234,6 +234,14 @@ static inline __deprecated void *bus_to_virt(unsigned long x) #define virt_to_dma(dev, addr) (__arch_virt_to_dma(dev, addr)) #endif +/* + * Optional coherency support. Currently used only by selected + * Intel XSC3-based systems. + */ +#ifndef arch_is_coherent +#define arch_is_coherent() 0 +#endif + #endif #include <asm-generic/memory_model.h> |