diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 04:41:07 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 04:41:07 -0400 |
| commit | 423b742bec02b6c8d4e060517ce05b4cd3fd91c1 (patch) | |
| tree | 3d4e090581970646d0afc92166bd490cc4977021 /arch/parisc/include/asm/pgtable.h | |
| parent | be944f1e79063e4f27b46c74f10c86b2387afa9f (diff) | |
| parent | f5520363532690f56e12126029864d9383d5203f (diff) | |
Merge branch 'kirkwood_boards_for_v3.5' of git://git.infradead.org/users/jcooper/linux into next/boards
* 'kirkwood_boards_for_v3.5' of git://git.infradead.org/users/jcooper/linux:
ARM: kirkwood: Add support for RaidSonic IB-NAS6210/6220 using devicetree
kirkwood: Add iconnect support
orion/kirkwood: create a generic function for gpio led blinking
kirkwood/orion: fix orion_gpio_set_blink
ARM: kirkwood: Define DNS-320/DNS-325 NAND in fdt
kirkwood: Allow nand to be configured via. devicetree
mtd: Add orion_nand devicetree bindings
ARM: kirkwood: Basic support for DNS-320 and DNS-325
Includes an update to v3.4-rc7
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/parisc/include/asm/pgtable.h')
| -rw-r--r-- | arch/parisc/include/asm/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h index 22dadeb58695..ee99f2339356 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h | |||
| @@ -44,6 +44,8 @@ struct vm_area_struct; | |||
| 44 | 44 | ||
| 45 | #endif /* !__ASSEMBLY__ */ | 45 | #endif /* !__ASSEMBLY__ */ |
| 46 | 46 | ||
| 47 | #include <asm/page.h> | ||
| 48 | |||
| 47 | #define pte_ERROR(e) \ | 49 | #define pte_ERROR(e) \ |
| 48 | printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) | 50 | printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) |
| 49 | #define pmd_ERROR(e) \ | 51 | #define pmd_ERROR(e) \ |