Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

From Sascha Hauer:

ARM i.MX fixes for -rc.

This contains a single compilation fix for the CODA driver.

* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
  [media] coda: Fix build due to iram.h rename

diff --combined drivers/media/platform/coda.c
index 1cf8293c0fb048054177b82e0f0ce44b704de81c,afadd3aba3e0f860c9ed60a4ca225265bd333740..4a980e029ca70163b30288663a7f273943002e18
--- 1/drivers/media/platform/coda.c
--- 2/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@@ -23,8 -23,8 +23,8 @@@
  #include <linux/slab.h>
  #include <linux/videodev2.h>
  #include <linux/of.h>
+ #include <linux/platform_data/imx-iram.h>
  
- #include <mach/iram.h>
  #include <media/v4l2-ctrls.h>
  #include <media/v4l2-device.h>
  #include <media/v4l2-ioctl.h>
@@@ -1891,7 -1891,7 +1891,7 @@@ static const struct of_device_id coda_d
  MODULE_DEVICE_TABLE(of, coda_dt_ids);
  #endif
  
 -static int __devinit coda_probe(struct platform_device *pdev)
 +static int coda_probe(struct platform_device *pdev)
  {
        const struct of_device_id *of_id =
                        of_match_device(of_match_ptr(coda_dt_ids), &pdev->dev);
@@@ -2033,7 -2033,7 +2033,7 @@@ static int coda_remove(struct platform_
  
  static struct platform_driver coda_driver = {
        .probe  = coda_probe,
 -      .remove = __devexit_p(coda_remove),
 +      .remove = coda_remove,
        .driver = {
                .name   = CODA_NAME,
                .owner  = THIS_MODULE,