From: Olof Johansson <olof@lixom.net>
Date: Wed, 12 Sep 2012 06:04:30 +0000 (-0700)
Subject: Merge branch 'renesas/pmu' into next/soc
X-Git-Tag: kvm-3.7-2~50^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e5567598c61907187261aba7095ac825d8060827;p=users%2Fdwmw2%2Flinux.git

Merge branch 'renesas/pmu' into next/soc

* renesas/pmu:
  ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit)
  ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit)
---

e5567598c61907187261aba7095ac825d8060827
diff --cc arch/arm/plat-samsung/devs.c
index fc49f3dabd765,8154fab70de84..6ff45d53362c1
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@@ -32,10 -32,7 +32,9 @@@
  #include <linux/platform_data/s3c-hsudc.h>
  #include <linux/platform_data/s3c-hsotg.h>
  
 +#include <media/s5p_hdmi.h>
 +
  #include <asm/irq.h>
- #include <asm/pmu.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>