diff options
author | Jan Kara <jack@suse.cz> | 2008-06-24 11:43:00 +0200 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2008-06-24 11:43:00 +0200 |
commit | 19fd426a18b48a0446ba4b54ac66264916dcb7f3 (patch) | |
tree | b9e0f2bc35e746c14f5e5e5519ed79f1eb4b0f98 /include/asm-mips/pgtable-bits.h | |
parent | e8183c2452041326c95258ecc7865b6fcd91c730 (diff) | |
parent | 62786b9e81a2dbe9c073a2ade52d33a2627d6d85 (diff) |
Merge branch 'master' into for_mm
Diffstat (limited to 'include/asm-mips/pgtable-bits.h')
-rw-r--r-- | include/asm-mips/pgtable-bits.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-mips/pgtable-bits.h b/include/asm-mips/pgtable-bits.h index 60e2f9338fc..51b34a48c84 100644 --- a/include/asm-mips/pgtable-bits.h +++ b/include/asm-mips/pgtable-bits.h @@ -134,6 +134,4 @@ #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | _CACHE_MASK) -#define CONF_CM_DEFAULT (PAGE_CACHABLE_DEFAULT>>_CACHE_SHIFT) - #endif /* _ASM_PGTABLE_BITS_H */ |