From: Olof Johansson <olof@lixom.net>
Date: Thu, 13 Sep 2012 05:34:11 +0000 (-0700)
Subject: Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup
X-Git-Tag: v3.7-rc1~162^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=025c95a6826ad8acfe871f33c2fa9208beeb38df;p=thirdparty%2Flinux.git

Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup

* 'clk' of git://github.com/hzhuang1/linux:
  ARM: mmp: remove unused definition in APBC and APMU
  ARM: mmp: move mmp2 clock definition to separated file
  arm: mmp: move pxa910 clock definition to separated file
  arm: mmp: move pxa168 clock definition to separated file
  arm: mmp: make private clock definition exclude from common clock
  + Linux 3.6-rc4
---

025c95a6826ad8acfe871f33c2fa9208beeb38df
diff --cc arch/arm/plat-samsung/devs.c
index 8154fab70de84,fc49f3dabd765..6ff45d53362c1
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@@ -32,7 -32,10 +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>