From 5fae89b73bb128cd2b6de65ad600716852877de4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 14 Jul 2013 17:55:42 -0500
Subject: [PATCH] ARM: update and reenable wandboard quad dtb patch

---
 arm-wandboard-quad.patch | 17 +++++++----------
 kernel.spec              |  7 +++++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/arm-wandboard-quad.patch b/arm-wandboard-quad.patch
index 8609e5e0e..ff746ed02 100644
--- a/arm-wandboard-quad.patch
+++ b/arm-wandboard-quad.patch
@@ -46,16 +46,13 @@ diff -uNr linux-3.10.0-0.rc7.git0.2.fc20.x86_64/arch/arm/boot/dts/imx6q-wandboar
 +	pinctrl-0 = <&pinctrl_usdhc3_2>;
 +	status = "okay";
 +};
-diff -uNr linux-3.10.0-0.rc7.git0.2.fc20.x86_64/arch/arm/boot/dts/Makefile linux-3.10.0-0.rc7.git0.2.fc20.armv7hl/arch/arm/boot/dts/Makefile
---- linux-3.10.0-0.rc7.git0.2.fc20.x86_64/arch/arm/boot/dts/Makefile	2013-06-30 15:04:21.224500036 -0500
-+++ linux-3.10.0-0.rc7.git0.2.fc20.armv7hl/arch/arm/boot/dts/Makefile	2013-06-30 15:08:11.259884856 -0500
-@@ -120,7 +120,8 @@
- 	imx6q-sabreauto.dtb \
+--- linux-3.11.0-0.rc0.git6.2.fc20.x86_64/arch/arm/boot/dts/Makefile.orig	2013-07-12 10:45:40.231087368 -0500
++++ linux-3.11.0-0.rc0.git6.2.fc20.x86_64/arch/arm/boot/dts/Makefile	2013-07-12 10:48:39.973819470 -0500
+@@ -131,6 +131,7 @@
  	imx6q-sabrelite.dtb \
  	imx6q-sabresd.dtb \
--	imx6q-sbc6x.dtb
-+	imx6q-sbc6x.dtb \
-+	imx6q-wandboard.dtb
+ 	imx6q-sbc6x.dtb \
++	imx6q-wandboard.dtb \
+ 	imx6sl-evk.dtb \
+ 	vf610-twr.dtb
  dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
- 	imx23-olinuxino.dtb \
- 	imx23-stmp378x_devb.dtb \
diff --git a/kernel.spec b/kernel.spec
index 0ac059ebd..01bc42368 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -729,7 +729,7 @@ Patch21004: arm-omap-load-tfp410.patch
 Patch21005: arm-tegra-usb-no-reset-linux33.patch
 
 # ARM wandboard
-# Patch21006: arm-wandboard-quad.patch
+Patch21006: arm-wandboard-quad.patch
 
 #rhbz 754518
 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1324,7 +1324,7 @@ ApplyPatch arm-lpae-ax88796.patch
 ApplyPatch drm-exynos-fix-multiple-definition-build-error.patch
 ApplyPatch arm-omap-load-tfp410.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
-#ApplyPatch arm-wandboard-quad.patch
+ApplyPatch arm-wandboard-quad.patch
 #
 # bugfixes to drivers and filesystems
 #
@@ -2261,6 +2261,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sun Jul 14 2013 Dennis Gilmore <dennis@ausil.us>
+- update and reenable wandboard quad dtb patch
+
 * Fri Jul 12 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc0.git7.1
 - Linux v3.10-9289-g9903883