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, 38 deletions

diff --git a/include/asm-arm/arch-ks8695/debug-macro.S b/include/asm-arm/arch-ks8695/debug-macro.S
deleted file mode 100644
index cd5f2fb1f06e..000000000000
--- a/include/asm-arm/arch-ks8695/debug-macro.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * include/asm-arm/arch-ks8695/debug-macro.S
- *
- * Copyright (C) 2006 Ben Dooks <ben@simtec.co.uk>
- * Copyright (C) 2006 Simtec Electronics
- *
- * KS8695 - Debug macros
- *
- * 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/hardware.h>
-#include <asm/arch/regs-uart.h>
-
-        .macro  addruart, rx
-                mrc     p15, 0, \rx, c1, c0
-                tst     \rx, #1                         @ MMU enabled?
-                ldreq   \rx, =KS8695_UART_PA            @ physical base address
-                ldrne   \rx, =KS8695_UART_VA            @ virtual base address
-        .endm
-
-        .macro  senduart, rd, rx
-                str     \rd, [\rx, #KS8695_URTH]        @ Write to Transmit Holding Register
-        .endm
-
-        .macro  busyuart, rd, rx
-1001:           ldr     \rd, [\rx, #KS8695_URLS]        @ Read Line Status Register
-                tst     \rd, #URLS_URTE                 @ Holding & Shift registers empty?
-                beq     1001b
-        .endm
-
-        .macro  waituart, rd, rx
-1001:           ldr     \rd, [\rx, #KS8695_URLS]        @ Read Line Status Register
-                tst     \rd, #URLS_URTHRE               @ Holding Register empty?
-                beq     1001b
-        .endm