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

* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB
  [ARM] 5166/1: magician: add MAINTAINERS entry
  [ARM] fix pnx4008 build errors
  [ARM] Fix SMP booting with non-zero PHYS_OFFSET
  [ARM] 5185/1: Fix spi num_chipselect for lubbock
  [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
  [ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include
  [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
  [ARM] Eliminate useless includes of asm/mach-types.h
  [ARM] Fix circular include dependency with IRQ headers
  avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
  avr32: Introduce arch/avr32/mach-*/include/mach
  avr32: Move include/asm-avr32 to arch/avr32/include/asm
  [ARM] sa1100_wdt: use reset_status to remember watchdog reset status
  [ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
  [ARM] pxa: introduce reset.h for reset specific header information

1 files changed, 0 insertions, 101 deletions

diff --git a/include/asm-arm/arch-ep93xx/ts72xx.h b/include/asm-arm/arch-ep93xx/ts72xx.h
deleted file mode 100644
index a94f63ff0535..000000000000
--- a/include/asm-arm/arch-ep93xx/ts72xx.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * linux/include/asm-arm/arch-ep93xx/ts72xx.h
- */
-
-/*
- * TS72xx memory map:
- *
- * virt         phys            size
- * febff000     22000000        4K      model number register
- * febfe000     22400000        4K      options register
- * febfd000     22800000        4K      options register #2
- * febfc000     [67]0000000     4K      NAND data register
- * febfb000     [67]0400000     4K      NAND control register
- * febfa000     [67]0800000     4K      NAND busy register
- * febf9000     10800000        4K      TS-5620 RTC index register
- * febf8000     11700000        4K      TS-5620 RTC data register
- */
-
-#define TS72XX_MODEL_PHYS_BASE          0x22000000
-#define TS72XX_MODEL_VIRT_BASE          0xfebff000
-#define TS72XX_MODEL_SIZE               0x00001000
-
-#define TS72XX_MODEL_TS7200             0x00
-#define TS72XX_MODEL_TS7250             0x01
-#define TS72XX_MODEL_TS7260             0x02
-
-
-#define TS72XX_OPTIONS_PHYS_BASE        0x22400000
-#define TS72XX_OPTIONS_VIRT_BASE        0xfebfe000
-#define TS72XX_OPTIONS_SIZE             0x00001000
-
-#define TS72XX_OPTIONS_COM2_RS485       0x02
-#define TS72XX_OPTIONS_MAX197           0x01
-
-
-#define TS72XX_OPTIONS2_PHYS_BASE       0x22800000
-#define TS72XX_OPTIONS2_VIRT_BASE       0xfebfd000
-#define TS72XX_OPTIONS2_SIZE            0x00001000
-
-#define TS72XX_OPTIONS2_TS9420          0x04
-#define TS72XX_OPTIONS2_TS9420_BOOT     0x02
-
-
-#define TS72XX_NOR_PHYS_BASE            0x60000000
-#define TS72XX_NOR2_PHYS_BASE           0x62000000
-
-#define TS72XX_NAND1_DATA_PHYS_BASE     0x60000000
-#define TS72XX_NAND2_DATA_PHYS_BASE     0x70000000
-#define TS72XX_NAND_DATA_VIRT_BASE      0xfebfc000
-#define TS72XX_NAND_DATA_SIZE           0x00001000
-
-#define TS72XX_NAND1_CONTROL_PHYS_BASE  0x60400000
-#define TS72XX_NAND2_CONTROL_PHYS_BASE  0x70400000
-#define TS72XX_NAND_CONTROL_VIRT_BASE   0xfebfb000
-#define TS72XX_NAND_CONTROL_SIZE        0x00001000
-
-#define TS72XX_NAND1_BUSY_PHYS_BASE     0x60800000
-#define TS72XX_NAND2_BUSY_PHYS_BASE     0x70800000
-#define TS72XX_NAND_BUSY_VIRT_BASE      0xfebfa000
-#define TS72XX_NAND_BUSY_SIZE           0x00001000
-
-
-#define TS72XX_RTC_INDEX_VIRT_BASE      0xfebf9000
-#define TS72XX_RTC_INDEX_PHYS_BASE      0x10800000
-#define TS72XX_RTC_INDEX_SIZE           0x00001000
-
-#define TS72XX_RTC_DATA_VIRT_BASE       0xfebf8000
-#define TS72XX_RTC_DATA_PHYS_BASE       0x11700000
-#define TS72XX_RTC_DATA_SIZE            0x00001000
-
-
-#ifndef __ASSEMBLY__
-#include <asm/io.h>
-
-static inline int board_is_ts7200(void)
-{
-        return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7200;
-}
-
-static inline int board_is_ts7250(void)
-{
-        return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7250;
-}
-
-static inline int board_is_ts7260(void)
-{
-        return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7260;
-}
-
-static inline int is_max197_installed(void)
-{
-        return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) &
-                                        TS72XX_OPTIONS_MAX197);
-}
-
-static inline int is_ts9420_installed(void)
-{
-        return !!(__raw_readb(TS72XX_OPTIONS2_VIRT_BASE) &
-                                        TS72XX_OPTIONS2_TS9420);
-}
-#endif