diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /include/asm-powerpc/pgtable-4k.h | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-powerpc/pgtable-4k.h')
| -rw-r--r-- | include/asm-powerpc/pgtable-4k.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/pgtable-4k.h b/include/asm-powerpc/pgtable-4k.h index 35f92813464c..b2e18629932a 100644 --- a/include/asm-powerpc/pgtable-4k.h +++ b/include/asm-powerpc/pgtable-4k.h | |||
| @@ -93,4 +93,4 @@ | |||
| 93 | (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) | 93 | (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) |
| 94 | 94 | ||
| 95 | #define pud_ERROR(e) \ | 95 | #define pud_ERROR(e) \ |
| 96 | printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pud_val(e)) | 96 | printk("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e)) |