Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Remove use of CONFIG_PPC_MERGE
  powerpc: Force printing of 'total_memory' to unsigned long long
  powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
  powerpc: Move include files to arch/powerpc/include/asm

1 files changed, 0 insertions, 42 deletions

diff --git a/include/asm-powerpc/reg_8xx.h b/include/asm-powerpc/reg_8xx.h
deleted file mode 100644
index e8ea346b21d3..000000000000
--- a/include/asm-powerpc/reg_8xx.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Contains register definitions common to PowerPC 8xx CPUs.  Notice
- */
-#ifndef _ASM_POWERPC_REG_8xx_H
-#define _ASM_POWERPC_REG_8xx_H
-
-/* Cache control on the MPC8xx is provided through some additional
- * special purpose registers.
- */
-#define SPRN_IC_CST     560     /* Instruction cache control/status */
-#define SPRN_IC_ADR     561     /* Address needed for some commands */
-#define SPRN_IC_DAT     562     /* Read-only data register */
-#define SPRN_DC_CST     568     /* Data cache control/status */
-#define SPRN_DC_ADR     569     /* Address needed for some commands */
-#define SPRN_DC_DAT     570     /* Read-only data register */
-
-/* Commands.  Only the first few are available to the instruction cache.
-*/
-#define IDC_ENABLE      0x02000000      /* Cache enable */
-#define IDC_DISABLE     0x04000000      /* Cache disable */
-#define IDC_LDLCK       0x06000000      /* Load and lock */
-#define IDC_UNLINE      0x08000000      /* Unlock line */
-#define IDC_UNALL       0x0a000000      /* Unlock all */
-#define IDC_INVALL      0x0c000000      /* Invalidate all */
-
-#define DC_FLINE        0x0e000000      /* Flush data cache line */
-#define DC_SFWT         0x01000000      /* Set forced writethrough mode */
-#define DC_CFWT         0x03000000      /* Clear forced writethrough mode */
-#define DC_SLES         0x05000000      /* Set little endian swap mode */
-#define DC_CLES         0x07000000      /* Clear little endian swap mode */
-
-/* Status.
-*/
-#define IDC_ENABLED     0x80000000      /* Cache is enabled */
-#define IDC_CERR1       0x00200000      /* Cache error 1 */
-#define IDC_CERR2       0x00100000      /* Cache error 2 */
-#define IDC_CERR3       0x00080000      /* Cache error 3 */
-
-#define DC_DFWT         0x40000000      /* Data cache is forced write through */
-#define DC_LES          0x20000000      /* Caches are little endian mode */
-
-#endif /* _ASM_POWERPC_REG_8xx_H */