From 993b4799d83b0ac33e9191abc7238f3271b3eb69 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 5 Mar 2013 19:13:25 +0000
Subject: [PATCH] Temporarily disable tegra until we get a fix from upstream

---
 config-arm-tegra | 3 +--
 kernel.spec      | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config-arm-tegra b/config-arm-tegra
index ec6f03587..53c415312 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -108,8 +108,7 @@ CONFIG_LEDS_RENESAS_TPU=y
 
 CONFIG_OF=y
 CONFIG_SERIAL_OF_PLATFORM=y
-# Need to fix, needs patch
-# CONFIG_SERIAL_TEGRA is not set
+CONFIG_SERIAL_TEGRA=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
diff --git a/kernel.spec b/kernel.spec
index 97b8da3a2..99fe2f0f2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -252,8 +252,8 @@ Summary: The Linux kernel
 # kernel up (unified kernel target), tegra and omap are only built on armv7 hfp/sfp
 %ifnarch armv7hl armv7l
 %define with_omap 0
-%define with_tegra 0
 %endif
+%define with_tegra 0
 
 # if requested, only build base kernel
 %if %{with_baseonly}
@@ -2281,6 +2281,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Mar  5 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Temporarily disable tegra until we get a fix from upstream
+
 * Tue Mar 05 2013 Josh Boyer <jwboyer@redhat.com>
 - Add 3 fixes for efi issues (rhbz 917984)
 - Enable CONFIG_IP6_NF_TARGET_MASQUERADE