From: Olof Johansson <olof@lixom.net>
Date: Wed, 30 Jan 2013 00:05:48 +0000 (-0800)
Subject: Merge tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0b79f2772a0c49266e611a36d55a2d0e2a241929;p=linux.git

Merge tag 'ux500-no-idh' of git://git./linux/kernel/git/linusw/linux-stericsson into next/cleanup

From Linus Walleij:
Removal of the <mach/id.h> include from ux500
- First an ACKed MFD patch deleting the only consumer
  of these cpu_is* functions outside of mach-ux500
- Introduce a new local cpu_is_u8580() in this patch
  set to avoid clashing with other patch sets.
- Finally de-globalize <mach/id.h>.

* tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: de-globalize <mach/id.h>
  ARM: ux500: Introduce cpu_is_u8580()
  mfd: prcmu: delete pin control helpers

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

0b79f2772a0c49266e611a36d55a2d0e2a241929
diff --cc arch/arm/mach-ux500/platsmp.c
index b8adac93421f3,1a92e071bd613..18f7af339dc9f
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@@ -16,11 -16,12 +16,12 @@@
  #include <linux/device.h>
  #include <linux/smp.h>
  #include <linux/io.h>
 +#include <linux/irqchip/arm-gic.h>
  
  #include <asm/cacheflush.h>
 -#include <asm/hardware/gic.h>
  #include <asm/smp_plat.h>
  #include <asm/smp_scu.h>
+ 
  #include <mach/hardware.h>
  #include <mach/setup.h>