From: Olof Johansson <olof@lixom.net>
Date: Mon, 17 Sep 2012 03:12:26 +0000 (-0700)
Subject: Merge tag 'omap-devel-am33xx-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~1964^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f4936639bc4a75218b5598ff69c52b9a8dd7f23d;p=firefly-linux-kernel-4.4.55.git

Merge tag 'omap-devel-am33xx-for-v3.7' of git://git./linux/kernel/git/tmlind/linux-omap into next/soc

From Tony Lindgren:
From Paul Walmsley <paul@pwsan.com>:

AM33xx hwmod data and miscellaneous clock and hwmod fixes.  AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.

(The shortlog makes no sense here since it contains mostly the dependent
cleanups that are part of the preceding branches).

Signed-off-by: Olof Johansson <olof@lixom.net>
---

f4936639bc4a75218b5598ff69c52b9a8dd7f23d
diff --cc arch/arm/mach-omap2/devices.c
index 02b9478b786f,1efa984b1a47..6f6893e38ffc
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -19,13 -19,11 +19,10 @@@
  #include <linux/of.h>
  #include <linux/platform_data/omap4-keypad.h>
  
- #include <mach/hardware.h>
- #include <mach/irqs.h>
  #include <asm/mach-types.h>
  #include <asm/mach/map.h>
 -#include <asm/pmu.h>
  
  #include "iomap.h"
- #include <plat/board.h>
  #include <plat/dma.h>
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>