diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2012-05-21 15:39:42 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2012-05-21 15:39:42 -0400 |
| commit | 0ad8c6a22d03a1598f7cc6585c65354dadca62ad (patch) | |
| tree | 1507deef3d55d5f3c71b2f76924fe1f6c6211905 /arch/parisc/include/asm/page.h | |
| parent | 8527f8e2934683e53405fbe876a4e6f4a0c46eb8 (diff) | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
Merge tag 'v3.4' with SCSI updates, needed for subsequent firewire-sbp2 changes
Linux 3.4
Diffstat (limited to 'arch/parisc/include/asm/page.h')
| -rw-r--r-- | arch/parisc/include/asm/page.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/page.h b/arch/parisc/include/asm/page.h index a84cc1f925f6..4e0e7dbf0f3f 100644 --- a/arch/parisc/include/asm/page.h +++ b/arch/parisc/include/asm/page.h | |||
| @@ -160,5 +160,11 @@ extern int npmem_ranges; | |||
| 160 | 160 | ||
| 161 | #include <asm-generic/memory_model.h> | 161 | #include <asm-generic/memory_model.h> |
| 162 | #include <asm-generic/getorder.h> | 162 | #include <asm-generic/getorder.h> |
| 163 | #include <asm/pdc.h> | ||
| 164 | |||
| 165 | #define PAGE0 ((struct zeropage *)__PAGE_OFFSET) | ||
| 166 | |||
| 167 | /* DEFINITION OF THE ZERO-PAGE (PAG0) */ | ||
| 168 | /* based on work by Jason Eckhardt (jason@equator.com) */ | ||
| 163 | 169 | ||
| 164 | #endif /* _PARISC_PAGE_H */ | 170 | #endif /* _PARISC_PAGE_H */ |