From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Sep 2012 06:02:08 +0000 (+1000)
Subject: Merge remote-tracking branch 'clk/clk-next'
X-Git-Tag: next-20120906~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dec4c2ac758ad65c1ee297fc25897b083b60d27f;p=karo-tx-linux.git

Merge remote-tracking branch 'clk/clk-next'
---

dec4c2ac758ad65c1ee297fc25897b083b60d27f
diff --cc arch/arm/mach-realview/realview_pba8.c
index 25fdc6b0135c,5032775dbfee..9992431b8a15
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@@ -27,9 -27,12 +27,10 @@@
  #include <linux/amba/mmci.h>
  #include <linux/amba/pl022.h>
  #include <linux/io.h>
+ #include <linux/platform_data/clk-realview.h>
  
  #include <asm/irq.h>
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  
diff --cc arch/arm/mach-realview/realview_pbx.c
index 05f28d853c70,de64ba0ddb95..17954a327e1b
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@@ -26,9 -26,12 +26,10 @@@
  #include <linux/amba/mmci.h>
  #include <linux/amba/pl022.h>
  #include <linux/io.h>
+ #include <linux/platform_data/clk-realview.h>
  
  #include <asm/irq.h>
 -#include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/smp_twd.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>