From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 16 Dec 2011 15:25:33 +0000 (+0000)
Subject: Merge branch 'samsung/board' into next/boards
X-Git-Tag: next-20111219~102^2~6^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8ba242db86fa093a8463beef86f6304a49a730f0;p=karo-tx-linux.git

Merge branch 'samsung/board' into next/boards

Conflicts:
	arch/arm/mach-s3c64xx/mach-crag6410.c
---

8ba242db86fa093a8463beef86f6304a49a730f0
diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
index 988ac2e48f08,42d3d64947b0..799558c15b4e
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -37,7 -37,8 +37,9 @@@
  #include <linux/mfd/wm831x/irq.h>
  #include <linux/mfd/wm831x/gpio.h>
  
+ #include <sound/wm1250-ev1.h>
+ 
 +#include <asm/hardware/vic.h>
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>