Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

Conflicts:

	arch/arm/mach-pxa/generic.c
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
	arch/arm/mach-pxa/pxa2xx.c
	arch/arm/mach-pxa/pxa3xx.c
	arch/arm/mach-pxa/reset.c
	arch/arm/mach-pxa/spitz.c
	arch/arm/mach-pxa/tosa.c
	drivers/watchdog/sa1100_wdt.c

diff --cc arch/arm/mach-pxa/generic.c
index 2834b7fff78c350c3dc3422d7ccf1ed9d6693aa6,36638926c5ce33d3a879755ee341b578b64f756a..ceaed007636631f6aa5d471222dcde9b743010a6
--- 1/arch/arm/mach-pxa/generic.c
--- 2/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@@ -25,7 -25,8 +25,8 @@@
  #include <asm/pgtable.h>
  #include <asm/mach/map.h>
  
 -#include <asm/arch/pxa-regs.h>
 -#include <asm/arch/reset.h>
 +#include <mach/pxa-regs.h>
++#include <mach/reset.h>
  
  #include "generic.h"
  

diff --cc arch/arm/mach-pxa/include/mach/hardware.h
Simple merge

diff --cc arch/arm/mach-pxa/include/mach/reset.h
index 0000000000000000000000000000000000000000,9489a48871a88a8196deb0bb001df9be2cebadb2..9489a48871a88a8196deb0bb001df9be2cebadb2
mode 000000,100644..100644
--- /dev/null
--- 2/include/asm-arm/arch-pxa/reset.h
+++ b/arch/arm/mach-pxa/include/mach/reset.h

diff --cc arch/arm/mach-pxa/pxa25x.c
index 3c2d22de9a13db08bb34ba021cb1b9932e81004f,49a7a296ff3109e76bf93bec0ea5811e82309ad6..9e5d8a8c6424f64a0d3bdead6622373f57a6603e
--- 1/arch/arm/mach-pxa/pxa25x.c
--- 2/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@@ -23,13 -23,14 +23,14 @@@
  #include <linux/suspend.h>
  #include <linux/sysdev.h>
  
 -#include <asm/hardware.h>
 -#include <asm/arch/irqs.h>
 -#include <asm/arch/pxa-regs.h>
 -#include <asm/arch/pxa2xx-regs.h>
 -#include <asm/arch/mfp-pxa25x.h>
 -#include <asm/arch/reset.h>
 -#include <asm/arch/pm.h>
 -#include <asm/arch/dma.h>
 +#include <mach/hardware.h>
 +#include <mach/irqs.h>
 +#include <mach/pxa-regs.h>
 +#include <mach/pxa2xx-regs.h>
 +#include <mach/mfp-pxa25x.h>
++#include <mach/reset.h>
 +#include <mach/pm.h>
 +#include <mach/dma.h>
  
  #include "generic.h"
  #include "devices.h"

diff --cc arch/arm/mach-pxa/pxa27x.c
index 6bec43484ba7dc5e05b555672a3afa9b63338908,a8c12347a5a955f13a072fc13204f3d6875f6b04..f9f6a9c31f4b06237ab4751c66b9bfc68d55e254
--- 1/arch/arm/mach-pxa/pxa27x.c
--- 2/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@@ -18,16 -18,17 +18,17 @@@
  #include <linux/platform_device.h>
  #include <linux/sysdev.h>
  
 -#include <asm/hardware.h>
 +#include <mach/hardware.h>
  #include <asm/irq.h>
 -#include <asm/arch/irqs.h>
 -#include <asm/arch/pxa-regs.h>
 -#include <asm/arch/pxa2xx-regs.h>
 -#include <asm/arch/mfp-pxa27x.h>
 -#include <asm/arch/reset.h>
 -#include <asm/arch/ohci.h>
 -#include <asm/arch/pm.h>
 -#include <asm/arch/dma.h>
 -#include <asm/arch/i2c.h>
 +#include <mach/irqs.h>
 +#include <mach/pxa-regs.h>
 +#include <mach/pxa2xx-regs.h>
 +#include <mach/mfp-pxa27x.h>
++#include <mach/reset.h>
 +#include <mach/ohci.h>
 +#include <mach/pm.h>
 +#include <mach/dma.h>
 +#include <mach/i2c.h>
  
  #include "generic.h"
  #include "devices.h"

diff --cc arch/arm/mach-pxa/pxa2xx.c
index 00b4de6d6bdd421a754330eef2c2cbadc1a553f8,d93d3e6a6e2777a6b83461ae166599330844ce89..73d04d81c75a2307b245ce27b155e01e5838eea1
--- 1/arch/arm/mach-pxa/pxa2xx.c
--- 2/arch/arm/mach-pxa/pxa2xx.c
+++ b/arch/arm/mach-pxa/pxa2xx.c
@@@ -14,10 -14,19 +14,19 @@@
  #include <linux/kernel.h>
  #include <linux/device.h>
  
 -#include <asm/hardware.h>
 -#include <asm/arch/pxa2xx-regs.h>
 -#include <asm/arch/mfp-pxa2xx.h>
 -#include <asm/arch/mfp-pxa25x.h>
 -#include <asm/arch/reset.h>
 -#include <asm/arch/irda.h>
++#include <mach/hardware.h>
++#include <mach/pxa2xx-regs.h>
 +#include <mach/mfp-pxa2xx.h>
 +#include <mach/mfp-pxa25x.h>
++#include <mach/reset.h>
 +#include <mach/irda.h>
  
+ void pxa2xx_clear_reset_status(unsigned int mask)
+ {
+       /* RESET_STATUS_* has a 1:1 mapping with RCSR */
+       RCSR = mask;
+ }
+ 
  static unsigned long pxa2xx_mfp_fir[] = {
        GPIO46_FICP_RXD,
        GPIO47_FICP_TXD,

diff --cc arch/arm/mach-pxa/pxa3xx.c
index 37b07212b5a519760785bb82cfc5057dcab1cf0f,3d36c790f5ce974009bbc8e313c5f58a08639f6d..03cbc38103ed230d3bf4f1309b9d8b6a6d0fba99
--- 1/arch/arm/mach-pxa/pxa3xx.c
--- 2/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@@ -22,12 -22,13 +22,13 @@@
  #include <linux/io.h>
  #include <linux/sysdev.h>
  
 -#include <asm/hardware.h>
 -#include <asm/arch/pxa3xx-regs.h>
 -#include <asm/arch/reset.h>
 -#include <asm/arch/ohci.h>
 -#include <asm/arch/pm.h>
 -#include <asm/arch/dma.h>
 -#include <asm/arch/ssp.h>
 +#include <mach/hardware.h>
 +#include <mach/pxa3xx-regs.h>
++#include <mach/reset.h>
 +#include <mach/ohci.h>
 +#include <mach/pm.h>
 +#include <mach/dma.h>
 +#include <mach/ssp.h>
  
  #include "generic.h"
  #include "devices.h"

diff --cc arch/arm/mach-pxa/reset.c
index fabead71d681a88272343bbd01b296648f0e1379,56f60d923a9dc7a71e2ee2dfe081450fbfe017f6..9996c612c3d685d2ed749578f118b93262bfb6cc
--- 1/arch/arm/mach-pxa/reset.c
--- 2/arch/arm/mach-pxa/reset.c
+++ b/arch/arm/mach-pxa/reset.c
@@@ -10,8 -10,11 +10,11 @@@
  #include <asm/io.h>
  #include <asm/proc-fns.h>
  
 -#include <asm/arch/pxa-regs.h>
 -#include <asm/arch/reset.h>
 +#include <mach/pxa-regs.h>
- #include <mach/pxa2xx-regs.h>
++#include <mach/reset.h>
+ 
+ unsigned int reset_status;
+ EXPORT_SYMBOL(reset_status);
  
  static void do_hw_reset(void);
  

diff --cc arch/arm/mach-pxa/spitz.c
index 26b9fa56cffd9ed6b81a1fc8c453855f5892dca0,207fe3e6a3d200d8e07d3261ff5b40c7a2dae9e7..cd39005c98ff2279124a2b23d00b4fb79eae41a3
--- 1/arch/arm/mach-pxa/spitz.c
--- 2/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@@ -35,18 -35,19 +35,19 @@@
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
  
 -#include <asm/arch/pxa-regs.h>
 -#include <asm/arch/pxa2xx-regs.h>
 -#include <asm/arch/pxa2xx-gpio.h>
 -#include <asm/arch/pxa27x-udc.h>
 -#include <asm/arch/reset.h>
 -#include <asm/arch/irda.h>
 -#include <asm/arch/mmc.h>
 -#include <asm/arch/ohci.h>
 -#include <asm/arch/udc.h>
 -#include <asm/arch/pxafb.h>
 -#include <asm/arch/akita.h>
 -#include <asm/arch/spitz.h>
 -#include <asm/arch/sharpsl.h>
 +#include <mach/pxa-regs.h>
 +#include <mach/pxa2xx-regs.h>
 +#include <mach/pxa2xx-gpio.h>
 +#include <mach/pxa27x-udc.h>
++#include <mach/reset.h>
 +#include <mach/irda.h>
 +#include <mach/mmc.h>
 +#include <mach/ohci.h>
 +#include <mach/udc.h>
 +#include <mach/pxafb.h>
 +#include <mach/akita.h>
 +#include <mach/spitz.h>
 +#include <mach/sharpsl.h>
  
  #include <asm/mach/sharpsl_param.h>
  #include <asm/hardware/scoop.h>

diff --cc arch/arm/mach-pxa/tosa.c
index 38bc59c441101324e94b668ee96ec57cf907366b,4bd7d4f006e27840f8600b279e04d84bc3f55d7a..5dab30eafddc83c750d46a7990b51c1c032c8271
--- 1/arch/arm/mach-pxa/tosa.c
--- 2/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@@ -34,16 -34,17 +34,17 @@@
  
  #include <asm/setup.h>
  #include <asm/mach-types.h>
 -#include <asm/arch/pxa2xx-regs.h>
 -#include <asm/arch/mfp-pxa25x.h>
 -#include <asm/arch/reset.h>
 -#include <asm/arch/irda.h>
 -#include <asm/arch/i2c.h>
 -#include <asm/arch/mmc.h>
 -#include <asm/arch/udc.h>
 -#include <asm/arch/tosa_bt.h>
 +#include <mach/pxa2xx-regs.h>
 +#include <mach/mfp-pxa25x.h>
++#include <mach/reset.h>
 +#include <mach/irda.h>
 +#include <mach/i2c.h>
 +#include <mach/mmc.h>
 +#include <mach/udc.h>
 +#include <mach/tosa_bt.h>
  
  #include <asm/mach/arch.h>
 -#include <asm/arch/tosa.h>
 +#include <mach/tosa.h>
  
  #include <asm/hardware/scoop.h>
  #include <asm/mach/sharpsl_param.h>

diff --cc arch/arm/mach-sa1100/generic.c
Simple merge

diff --cc arch/arm/mach-sa1100/include/mach/reset.h
index 0000000000000000000000000000000000000000,f61957e6842a50a88fd9d5cf042e253bf296ec6d..f61957e6842a50a88fd9d5cf042e253bf296ec6d
mode 000000,100644..100644
--- /dev/null
--- 2/include/asm-arm/arch-sa1100/reset.h
+++ b/arch/arm/mach-sa1100/include/mach/reset.h

diff --cc drivers/watchdog/sa1100_wdt.c
index 52a533c274fdda2afc785e00af1af6f76ffa7637,e42002d2f815898069dd13ff365b96f616554d3f..97d9da758dccd7a0977ffea9d93ec0938f4b749b
--- 1/drivers/watchdog/sa1100_wdt.c
--- 2/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@@ -28,10 -28,12 +28,11 @@@
  #include <linux/bitops.h>
  
  #ifdef CONFIG_ARCH_PXA
 -#include <asm/arch/pxa-regs.h>
 +#include <mach/pxa-regs.h>
  #endif
  
 -#include <asm/arch/reset.h>
 -
 -#include <asm/hardware.h>
++#include <mach/reset.h>
 +#include <mach/hardware.h>
  #include <asm/uaccess.h>
  
  #define OSCR_FREQ             CLOCK_TICK_RATE