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

* master.kernel.org:/home/rmk/linux-2.6-arm:
  TWL4030: fix clk API usage
  [ARM] 5364/1: allow flush_ioremap_region() to be used from modules
  [ARM] w90x900: fix build errors and warnings
  [ARM] i.MX add missing include
  [ARM] i.MX: fix breakage from commit 278892736e99330195c8ae5861bcd9d791bbf19e
  [ARM] i.MX: remove LCDC controller register definitions from imx-regs.h

diff --combined drivers/mfd/twl4030-core.c
index 074b11ffbf41330efc0c74ea81f5b45656775586,4a488be91ed703ac54fefd8dcbc69d62499a5f0a..e7ab0035d3054fdfd159b48c9e548150758b986b
--- 1/drivers/mfd/twl4030-core.c
--- 2/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@@ -38,9 -38,6 +38,9 @@@
  #include <linux/i2c.h>
  #include <linux/i2c/twl4030.h>
  
 +#ifdef CONFIG_ARM
 +#include <mach/cpu.h>
 +#endif
  
  /*
   * The TWL4030 "Triton 2" is one of a family of a multi-function "Power
@@@ -649,7 -646,7 +649,7 @@@ static inline int __init unprotect_pm_m
        return e;
  }
  
- static void __init clocks_init(void)
+ static void __init clocks_init(struct device *dev)
  {
        int e = 0;
        struct clk *osc;
@@@ -658,9 -655,9 +658,9 @@@
  
  #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
        if (cpu_is_omap2430())
-               osc = clk_get(NULL, "osc_ck");
+               osc = clk_get(dev, "osc_ck");
        else
-               osc = clk_get(NULL, "osc_sys_ck");
+               osc = clk_get(dev, "osc_sys_ck");
  
        if (IS_ERR(osc)) {
                printk(KERN_WARNING "Skipping twl4030 internal clock init and "
@@@ -776,7 -773,7 +776,7 @@@ twl4030_probe(struct i2c_client *client
        inuse = true;
  
        /* setup clock framework */
-       clocks_init();
+       clocks_init(&client->dev);
  
        /* Maybe init the T2 Interrupt subsystem */
        if (client->irq