diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /arch/sparc/include/asm/page_32.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'arch/sparc/include/asm/page_32.h')
| -rw-r--r-- | arch/sparc/include/asm/page_32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h index d1806edc0958..f72080bdda94 100644 --- a/arch/sparc/include/asm/page_32.h +++ b/arch/sparc/include/asm/page_32.h | |||
| @@ -152,6 +152,6 @@ extern unsigned long pfn_base; | |||
| 152 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 152 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
| 153 | 153 | ||
| 154 | #include <asm-generic/memory_model.h> | 154 | #include <asm-generic/memory_model.h> |
| 155 | #include <asm-generic/page.h> | 155 | #include <asm-generic/getorder.h> |
| 156 | 156 | ||
| 157 | #endif /* _SPARC_PAGE_H */ | 157 | #endif /* _SPARC_PAGE_H */ |