diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-19 09:37:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-19 09:37:31 +0200 |
| commit | d819c49da624e3ee09b2844603d58265039eecdd (patch) | |
| tree | 09a503b98769767d81337ec8e5c14c60874a4e77 /include/asm-mips/pgtable-bits.h | |
| parent | f18f982abf183e91f435990d337164c7a43d1e6d (diff) | |
| parent | 9bedbcb207ed9a571b239231d99c8fd4a34ae24d (diff) | |
Merge branch 'linus' into sched/urgent
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 */ |