From f05cdeebfe0ab8efe43b7157af04ee50c46d6074 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Aug 26 2012 08:44:25 +0000
Subject: Add patch to fix build on ARM, Enable USB ULPI driver to fix some USB ports


---

diff --git a/arm-read_current_timer.patch b/arm-read_current_timer.patch
new file mode 100644
index 0000000..dc6a444
--- /dev/null
+++ b/arm-read_current_timer.patch
@@ -0,0 +1,39 @@
+read_current_timer is used in the get_cycles() function when
+ARM_ARCH_TIMER is set, and that function can be inlined into
+driver modules, so we should export the function to avoid
+errors like
+
+ERROR: "read_current_timer" [drivers/video/udlfb.ko] undefined!
+ERROR: "read_current_timer" [crypto/tcrypt.ko] undefined!
+
+Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
+Cc: Shinya Kuribayashi <shinya.kuribayashi.px@xxxxxxxxxxx>
+Cc: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
+Cc: Will Deacon <will.deacon@xxxxxxx>
+Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
+---
+ arch/arm/kernel/arch_timer.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
+index cf25880..6327d1f 100644
+--- a/arch/arm/kernel/arch_timer.c
++++ b/arch/arm/kernel/arch_timer.c
+@@ -14,6 +14,7 @@
+ #include <linux/device.h>
+ #include <linux/smp.h>
+ #include <linux/cpu.h>
++#include <linux/export.h>
+ #include <linux/jiffies.h>
+ #include <linux/clockchips.h>
+ #include <linux/interrupt.h>
+@@ -232,6 +233,7 @@ int read_current_timer(unsigned long *timer_val)
+ 	*timer_val = arch_counter_get_cntpct();
+ 	return 0;
+ }
++EXPORT_SYMBOL_GPL(read_current_timer);
+ 
+ static struct clocksource clocksource_counter = {
+ 	.name	= "arch_sys_counter",
+-- 
+1.7.10
diff --git a/config-arm-generic b/config-arm-generic
index 31ebd9b..b75fc42 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -88,6 +88,8 @@ CONFIG_RFKILL_GPIO=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIO_GENERIC_PLATFORM=m
 
+CONFIG_USB_ULPI=m
+
 CONFIG_SND_ARM=y
 CONFIG_SND_ARMAACI=m
 CONFIG_SND_SOC=m
diff --git a/kernel.spec b/kernel.spec
index 390dae4..582e3f0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -723,6 +723,7 @@ Patch14010: lis3-improve-handling-of-null-rate.patch
 
 
 # ARM
+Patch21000: arm-read_current_timer.patch
 # OMAP
 
 # ARM tegra
@@ -1312,6 +1313,7 @@ ApplyPatch team-net-next-20120808.patch
 #
 # ARM
 #
+ApplyPatch arm-read_current_timer.patch
 ApplyPatch arm-tegra-nvec-kconfig.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 ApplyPatch arm-tegra-sdhci-module-fix.patch
@@ -2305,6 +2307,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sat Aug 25 2012 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add patch to fix build on ARM
+- Enable USB ULPI driver to fix some USB ports
+
 * Fri Aug 24 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc3.git1.1
 - Linux v3.6-rc3-37-g2d809dc