diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 20:42:39 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 20:42:39 +0900 |
commit | 8faba6121566248330e738d25a2c43d7500fb9f0 (patch) | |
tree | 9cb09b2ec00b504dd24e1272126a22cd365e7282 /arch/sh/include/asm/page.h | |
parent | 4291b730cd0f0cf98a90d946b6cabbd804397350 (diff) | |
parent | 78bf04fc96f509474c6b443b515d6b79bb7bf584 (diff) |
Merge branch 'sh/ioremap-fixed'
Diffstat (limited to 'arch/sh/include/asm/page.h')
-rw-r--r-- | arch/sh/include/asm/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h index a86c0f1d05d45..61e58105adc30 100644 --- a/arch/sh/include/asm/page.h +++ b/arch/sh/include/asm/page.h @@ -88,7 +88,7 @@ typedef struct { unsigned long pgd; } pgd_t; #define __pte(x) ((pte_t) { (x) } ) #else typedef struct { unsigned long long pte_low; } pte_t; -typedef struct { unsigned long pgprot; } pgprot_t; +typedef struct { unsigned long long pgprot; } pgprot_t; typedef struct { unsigned long pgd; } pgd_t; #define pte_val(x) ((x).pte_low) #define __pte(x) ((pte_t) { (x) } ) |