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

* master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits)
  [ARM] spelling fixes
  [ARM] at91_adc parenthesis balance
  [ARM] 4400/1: S3C24XX: Add high-speed MMC device definition
  [ARM] 4399/2: S3C2443: Fix SMDK2443 nand timings
  [ARM] 4398/1: S3C2443: Fix watchdog IRQ number
  [ARM] 4397/1: S3C2443: remove SDI0/1 IRQ ambiguity
  [ARM] 4396/1: S3C2443: Add missing HCLK clocks
  [ARM] 4395/1: S3C24XX: add include of <linux/sysdev.h> to relevant machines
  [ARM] 4388/1: no need for arm/mm mmap range checks for non-mmu
  [ARM] 4387/1: fix /proc/cpuinfo formatting for pre-ARM7 parts
  [ARM] ARMv6: add CPU_HAS_ASID configuration
  [ARM] integrator: fix pci_v3 compile error with DEBUG_LL
  [ARM] gic: Fix gic cascade irq handling
  [ARM] Silence OMAP kernel configuration warning
  [ARM] Update ARM syscalls
  [ARM] 4384/1: S3C2412/13 SPI registers offset correction
  [ARM] 4383/1: iop: fix usage of '__init' and 'inline' in iop files
  [ARM] 4382/1: iop13xx: fix msi support
  [ARM] Remove Integrator/CP SMP platform support
  [ARM] 4378/1: KS8695: Serial driver fix
  ...

diff --combined arch/arm/mach-iop13xx/pci.c
index 6baeb26,306f82e..9d63d7f
--- 1/arch/arm/mach-iop13xx/pci.c
--- 2/arch/arm/mach-iop13xx/pci.c
+++ b/arch/arm/mach-iop13xx/pci.c
@@@ -19,11 -19,10 +19,11 @@@
  
  #include <linux/pci.h>
  #include <linux/delay.h>
 -
 +#include <linux/jiffies.h>
  #include <asm/irq.h>
  #include <asm/hardware.h>
  #include <asm/sizes.h>
 +#include <asm/signal.h>
  #include <asm/mach/pci.h>
  #include <asm/arch/pci.h>
  
@@@ -145,7 -144,7 +145,7 @@@ void iop13xx_map_pci_memory(void
        }
  }
  
- static inline int iop13xx_atu_function(int atu)
+ static int iop13xx_atu_function(int atu)
  {
        int func = 0;
        /* the function number depends on the value of the
@@@ -260,7 -259,7 +260,7 @@@ static int iop13xx_atux_pci_status(int 
   * data.  Note that the data dependency on %0 encourages an abort
   * to be detected before we return.
   */
- static inline u32 iop13xx_atux_read(unsigned long addr)
+ static u32 iop13xx_atux_read(unsigned long addr)
  {
        u32 val;
  
@@@ -388,7 -387,7 +388,7 @@@ static int iop13xx_atue_pci_status(int 
        return err;
  }
  
- static inline int __init
+ static int
  iop13xx_pcie_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
  {
        WARN_ON(idsel != 0);
@@@ -402,7 -401,7 +402,7 @@@
        }
  }
  
- static inline u32 iop13xx_atue_read(unsigned long addr)
+ static u32 iop13xx_atue_read(unsigned long addr)
  {
        u32 val;
  
@@@ -990,7 -989,7 +990,7 @@@ void __init iop13xx_pci_init(void
                        "imprecise external abort");
  }
  
- /* intialize the pci memory space.  handle any combination of
+ /* initialize the pci memory space.  handle any combination of
   * atue and atux enabled/disabled
   */
  int iop13xx_pci_setup(int nr, struct pci_sys_data *sys)

diff --combined arch/arm/plat-iop/pci.c
index 7bf4229,c200c28..2b5aa11
--- 1/arch/arm/plat-iop/pci.c
--- 2/arch/arm/plat-iop/pci.c
+++ b/arch/arm/plat-iop/pci.c
@@@ -19,7 -19,6 +19,7 @@@
  #include <linux/ioport.h>
  #include <asm/io.h>
  #include <asm/irq.h>
 +#include <asm/signal.h>
  #include <asm/system.h>
  #include <asm/hardware.h>
  #include <asm/mach/pci.h>
@@@ -86,10 -85,10 +86,10 @@@ static int iop3xx_pci_status(void
  
  /*
   * Simply write the address register and read the configuration
-  * data.  Note that the 4 nop's ensure that we are able to handle
+  * data.  Note that the 4 nops ensure that we are able to handle
   * a delayed abort (in theory.)
   */
- static inline u32 iop3xx_read(unsigned long addr)
+ static u32 iop3xx_read(unsigned long addr)
  {
        u32 val;
  
@@@ -322,7 -321,7 +322,7 @@@ void __init iop3xx_atu_disable(void
  /* Flag to determine whether the ATU is initialized and the PCI bus scanned */
  int init_atu;
  
- void iop3xx_pci_preinit(void)
+ void __init iop3xx_pci_preinit(void)
  {
        if (iop3xx_get_init_atu() == IOP3XX_INIT_ATU_ENABLE) {
                iop3xx_atu_disable();