Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5460/1: Orion: reduce namespace pollution
  [ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config
  [ARM] 5457/1: mach-imx gpio buildfix
  [ARM] 5456/1: add sys_preadv and sys_pwritev
  [ARM] pxa/pcm990: start external GPIOs immediately after built-in ones
  [ARM] pxa/palm27x: General fix for Palm27x aSoC driver
  [ARM] pxa/mioa701: use GPIO95 as AC97 reset line
  [ARM] pxa: merge AC97 platform data structures
  [ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h

diff --combined arch/arm/plat-orion/time.c
index 2faf9dba4ef794846d9deb70ec66a7126d84fe35,bdeb166b4b201b43f0cfb3914f25e13d26b89ea2..de8a001fc3a9d0a4fbb6622005ba596c645d7fd0
--- 1/arch/arm/plat-orion/time.c
--- 2/arch/arm/plat-orion/time.c
+++ b/arch/arm/plat-orion/time.c
@@@ -16,7 -16,7 +16,7 @@@
  #include <linux/interrupt.h>
  #include <linux/irq.h>
  #include <asm/mach/time.h>
- #include <mach/hardware.h>
+ #include <mach/bridge-regs.h>
  
  /*
   * Number of timer ticks per jiffy.
@@@ -41,7 -41,7 +41,7 @@@ static u32 ticks_per_jiffy
  /*
   * Clocksource handling.
   */
 -static cycle_t orion_clksrc_read(void)
 +static cycle_t orion_clksrc_read(struct clocksource *cs)
  {
        return 0xffffffff - readl(TIMER0_VAL);
  }