diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:03:21 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:04:25 -0400 |
| commit | ffe315012510165ce82e4dd4767f0a5dba9edbf7 (patch) | |
| tree | f601cd980af9d0ced5ca9aedecef4fa0d2ca0e15 /arch/mips/include/asm/mipsregs.h | |
| parent | e2d3a35ee427aaba99b6c68a56609ce276c51270 (diff) | |
| parent | 4a8e43feeac7996b8de2d5b2823e316917493df4 (diff) | |
Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers
UAPI Disintegration 2012-10-09
Conflicts:
MAINTAINERS
arch/arm/configs/bcmring_defconfig
arch/arm/mach-imx/clk-imx51-imx53.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c
Diffstat (limited to 'arch/mips/include/asm/mipsregs.h')
| -rw-r--r-- | arch/mips/include/asm/mipsregs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h index 7f87d824eeb0..528fda1e957c 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h | |||
| @@ -590,12 +590,15 @@ | |||
| 590 | #define MIPS_CONF3_VEIC (_ULCAST_(1) << 6) | 590 | #define MIPS_CONF3_VEIC (_ULCAST_(1) << 6) |
| 591 | #define MIPS_CONF3_LPA (_ULCAST_(1) << 7) | 591 | #define MIPS_CONF3_LPA (_ULCAST_(1) << 7) |
| 592 | #define MIPS_CONF3_DSP (_ULCAST_(1) << 10) | 592 | #define MIPS_CONF3_DSP (_ULCAST_(1) << 10) |
| 593 | #define MIPS_CONF3_RXI (_ULCAST_(1) << 12) | ||
| 593 | #define MIPS_CONF3_ULRI (_ULCAST_(1) << 13) | 594 | #define MIPS_CONF3_ULRI (_ULCAST_(1) << 13) |
| 594 | 595 | ||
| 595 | #define MIPS_CONF4_MMUSIZEEXT (_ULCAST_(255) << 0) | 596 | #define MIPS_CONF4_MMUSIZEEXT (_ULCAST_(255) << 0) |
| 596 | #define MIPS_CONF4_MMUEXTDEF (_ULCAST_(3) << 14) | 597 | #define MIPS_CONF4_MMUEXTDEF (_ULCAST_(3) << 14) |
| 597 | #define MIPS_CONF4_MMUEXTDEF_MMUSIZEEXT (_ULCAST_(1) << 14) | 598 | #define MIPS_CONF4_MMUEXTDEF_MMUSIZEEXT (_ULCAST_(1) << 14) |
| 598 | 599 | ||
| 600 | #define MIPS_CONF6_SYND (_ULCAST_(1) << 13) | ||
| 601 | |||
| 599 | #define MIPS_CONF7_WII (_ULCAST_(1) << 31) | 602 | #define MIPS_CONF7_WII (_ULCAST_(1) << 31) |
| 600 | 603 | ||
| 601 | #define MIPS_CONF7_RPS (_ULCAST_(1) << 2) | 604 | #define MIPS_CONF7_RPS (_ULCAST_(1) << 2) |