From: Olof Johansson <olof@lixom.net>
Date: Mon, 17 Sep 2012 03:05:06 +0000 (-0700)
Subject: Merge tag 'omap-cleanup-sparseirq-for-v3.7' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8e51036d348956a3cdb5a977234c395fdb82e170;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'omap-cleanup-sparseirq-for-v3.7' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren:

This branch contains changes needed to make omap2+
work properly with sparse IRQ. It also removes
dependencies to mach/hardware.h. These help moving
things towards ARM single zImage support.

This branch is based on a commit in tty-next
branch with omap-devel-gpmc-fixed-for-v3.7 and
cleanup-omap-tags-for-v3.7 merged in to keep things
compiling and sort out some merge conflicts.

* tag 'omap-cleanup-sparseirq-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: Move SoC specific headers from plat to mach for omap1
  ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2
  ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+
  ARM: OMAP: Remove unused old gpio-switch.h
  ARM: OMAP1: Move plat/irqs.h to mach/irqs.h
  ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ
  ARM: OMAP2+: Prepare for irqs.h removal
  W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h
  Input: omap-keypad: Remove dependencies to mach includes
  ARM: OMAP: Move gpio.h to include/linux/platform_data
  ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end
  ARM: OMAP2+: Remove unused nand_irq for GPMC
  ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c
  ARM: OMAP1: Define OMAP1_INT_I2C locally
  ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h
---

8e51036d348956a3cdb5a977234c395fdb82e170
diff --cc arch/arm/mach-omap2/devices.c
index 2deec1749e0c,1efa984b1a47..6f6893e38ffc
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -19,10 -19,9 +19,8 @@@
  #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/dma.h>