Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5182/1: pxa: Fix pcm990 compilation
  [ARM] Fix explicit asm(-arm)?/arch-foo references
  [ARM] move include/asm-arm to arch/arm/include/asm
  [ARM] Remove explicit dependency for misc.o from compressed/Makefile
  [ARM] initrd: claim initrd memory exclusively
  [ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2)
  [ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
  [ARM] add Sascha Hauer as Freescale i.MX Maintainer
  [ARM] i.MX: add missing clock functions exports
  [ARM] i.MX: remove set_imx_fb_info() export
  [ARM] mx1ads: make mmc platform data available for modules
  [ARM] mx2: add missing Kconfig dependency

1 files changed, 0 insertions, 69 deletions

diff --git a/include/asm-arm/cpu-multi32.h b/include/asm-arm/cpu-multi32.h
deleted file mode 100644
index 3479de9266e5..000000000000
--- a/include/asm-arm/cpu-multi32.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- *  linux/include/asm-arm/cpu-multi32.h
- *
- *  Copyright (C) 2000 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <asm/page.h>
-
-struct mm_struct;
-
-/*
- * Don't change this structure - ASM code
- * relies on it.
- */
-extern struct processor {
-        /* MISC
-         * get data abort address/flags
-         */
-        void (*_data_abort)(unsigned long pc);
-        /*
-         * Retrieve prefetch fault address
-         */
-        unsigned long (*_prefetch_abort)(unsigned long lr);
-        /*
-         * Set up any processor specifics
-         */
-        void (*_proc_init)(void);
-        /*
-         * Disable any processor specifics
-         */
-        void (*_proc_fin)(void);
-        /*
-         * Special stuff for a reset
-         */
-        void (*reset)(unsigned long addr) __attribute__((noreturn));
-        /*
-         * Idle the processor
-         */
-        int (*_do_idle)(void);
-        /*
-         * Processor architecture specific
-         */
-        /*
-         * clean a virtual address range from the
-         * D-cache without flushing the cache.
-         */
-        void (*dcache_clean_area)(void *addr, int size);
-
-        /*
-         * Set the page table
-         */
-        void (*switch_mm)(unsigned long pgd_phys, struct mm_struct *mm);
-        /*
-         * Set a possibly extended PTE.  Non-extended PTEs should
-         * ignore 'ext'.
-         */
-        void (*set_pte_ext)(pte_t *ptep, pte_t pte, unsigned int ext);
-} processor;
-
-#define cpu_proc_init()                 processor._proc_init()
-#define cpu_proc_fin()                  processor._proc_fin()
-#define cpu_reset(addr)                 processor.reset(addr)
-#define cpu_do_idle()                   processor._do_idle()
-#define cpu_dcache_clean_area(addr,sz)  processor.dcache_clean_area(addr,sz)
-#define cpu_set_pte_ext(ptep,pte,ext)   processor.set_pte_ext(ptep,pte,ext)
-#define cpu_do_switch_mm(pgd,mm)        processor.switch_mm(pgd,mm)