From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 29 Feb 2012 21:17:30 +0000 (+0000)
Subject: Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a26d3c4fcd4bb875ae5adc32f27fab7a478bb00d;p=linux-beck.git

Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

* 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix L4_EMU_34XX_BASE error after iomap changes
  ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers
  ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h
  ARM: OMAP2+: Move most of plat/io.h into local iomap.h
  ARM: OMAP1: Move most of plat/io.h into local iomap.h
  ARM: OMAP1: Move 16xx GPIO system clock to platform init code
  ARM: OMAP: Move omap_init_consistent_dma_size() to local common.h
  ARM: OMAP2+: Move SDRC related functions from io.h into local common.h
  ARM: OMAP2+: Drop DISPC L3 firewall code
  ARM: OMAP2xxx: PM: remove obsolete timer disable code in the suspend path
  ARM: OMAP: McSPI: Remove unused flag from struct omap2_mcspi_device_config

(update to latest rmk/for-arm-soc branch)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

a26d3c4fcd4bb875ae5adc32f27fab7a478bb00d
diff --cc arch/arm/mach-omap2/prm44xx.c
index a1d6154dc120,f4c151989c91..eac623c7c3d8
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@@ -17,11 -17,11 +17,12 @@@
  #include <linux/err.h>
  #include <linux/io.h>
  
- #include "common.h"
  #include <plat/cpu.h>
 +#include <plat/irqs.h>
  #include <plat/prcm.h>
  
+ #include "iomap.h"
+ #include "common.h"
  #include "vp.h"
  #include "prm44xx.h"
  #include "prm-regbits-44xx.h"