git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b60d52 e433d44)
Merge branch 'renesas/pmu' into next/soc
authorOlof Johansson <olof@lixom.net>
Wed, 12 Sep 2012 06:04:30 +0000 (23:04 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 12 Sep 2012 06:04:30 +0000 (23:04 -0700)
* renesas/pmu:
  ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit)
  ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit)

1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-ux500/cpu-db8500.c patch | diff1 | diff2 | blob | history
arch/arm/plat-samsung/devs.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-ux500/cpu-db8500.c
Simple merge
diff --cc arch/arm/plat-samsung/devs.c
index fc49f3d,8154fab..6ff45d5
--- 1/arch/arm/plat-samsung/devs.c
--- 2/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>
Pandora Kernel Repository