[kernel/f17] Fix ARM breakage due to linux v3.6 rebase

[mchehab]

commit 088b3292dd3b3f0c5acd6898bfca3986d23d4ef6
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date:   Fri Oct 12 21:02:26 2012 -0300

    Fix ARM breakage due to linux v3.6 rebase

 kernel.spec                     |    3 +
 linux-3.6-arm-build-fixup.patch |   82 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index e275579..18348fe 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -747,6 +747,8 @@ Patch22070: net-tcp-bz857324.patch
 
 Patch22071: 3.6.2-stable-queue.patch
 
+Patch22072: linux-3.6-arm-build-fixup.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1309,6 +1311,7 @@ ApplyPatch vmbugon-warnon.patch
 #
 # ARM
 #
+ApplyPatch linux-3.6-arm-build-fixup.patch
 #pplyPatch arm-omap-dt-compat.patch
 # ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
 ApplyPatch arm-tegra-nvec-kconfig.patch
diff --git a/linux-3.6-arm-build-fixup.patch b/linux-3.6-arm-build-fixup.patch
new file mode 100644
index 0000000..3650be7
--- /dev/null
+++ b/linux-3.6-arm-build-fixup.patch
@@ -0,0 +1,82 @@
+From: Mauro Carvalho Chehab <mchehab at redhat.com>
+Date: Fri, 12 Oct 2012 16:26:43 -0400
+Subject: [PATCH] snd-tea575x: Fix radio-shark build, when PCI is not compiled
+
+On ARM devices, those vars get undefined:
+
+ERROR: "snd_tea575x_init" [drivers/media/radio/radio-shark.ko] undefined!
+ERROR: "snd_tea575x_exit" [drivers/media/radio/radio-shark.ko] undefined!
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
+
+diff --git a/sound/Kconfig b/sound/Kconfig
+index 261a03c..fef150c 100644
+--- a/sound/Kconfig
++++ b/sound/Kconfig
+@@ -77,6 +77,12 @@ source "sound/drivers/Kconfig"
+ 
+ source "sound/isa/Kconfig"
+ 
++# I2C device, used by sound/pci and by some drivers/media USB devices
++config SND_TEA575X
++	tristate
++	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
++	default y
++
+ source "sound/pci/Kconfig"
+ 
+ source "sound/ppc/Kconfig"
+diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
+index ff3af6e..f93fda7 100644
+--- a/sound/pci/Kconfig
++++ b/sound/pci/Kconfig
+@@ -1,10 +1,5 @@
+ # ALSA PCI drivers
+ 
+-config SND_TEA575X
+-	tristate
+-	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO
+-	default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO
+-
+ menuconfig SND_PCI
+ 	bool "PCI sound devices"
+ 	depends on PCI
+
+From: Arnd Bergmann <arnd at arndb.de>
+Subject: [PATCH] ARM: export read_current_timer
+	https://patchwork.kernel.org/patch/1361481/
+
+	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 at arndb.de>
+	Cc: Shinya Kuribayashi <shinya.kuribayashi.px at renesas.com>
+	Cc: Stephen Boyd <sboyd at codeaurora.org>
+	Cc: Will Deacon <will.deacon at arm.com>
+	Cc: Russell King <rmk+kernel at arm.linux.org.uk>
+
+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",