From: Thierry Reding <treding@nvidia.com>
Date: Thu, 24 Oct 2013 13:00:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'imx-mxs/for-next'
X-Git-Tag: next-20131024~21
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=9b2e64d10c26128c796884787e02cfab3767b6db

Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
	arch/arm/mach-imx/mach-imx6q.c
---

9b2e64d10c26128c796884787e02cfab3767b6db
diff --cc arch/arm/boot/dts/imx28-evk.dts
index aa33393903a8,1f63845b8ce0..4267c2b05d60
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@@ -182,11 -182,8 +182,12 @@@
  			};
  
  			lradc@80050000 {
+ 				fsl,lradc-touchscreen-wires = <4>;
  				status = "okay";
 +				fsl,lradc-touchscreen-wires = <4>;
 +				fsl,ave-ctrl = <4>;
 +				fsl,ave-delay = <2>;
 +				fsl,settling = <10>;
  			};
  
  			i2c0: i2c@80058000 {
diff --cc arch/arm/mach-imx/mach-imx6q.c
index eae56423f0ae,1ac719d3f568..170f13f72157
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -23,8 -23,9 +23,9 @@@
  #include <linux/of_address.h>
  #include <linux/of_irq.h>
  #include <linux/of_platform.h>
- #include <linux/pm_opp.h>
 -#include <linux/opp.h>
+ #include <linux/pci.h>
  #include <linux/phy.h>
++#include <linux/pm_opp.h>
  #include <linux/reboot.h>
  #include <linux/regmap.h>
  #include <linux/micrel_phy.h>