Mauro Carvalho Chehab 088b329
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Mauro Carvalho Chehab 088b329
Date: Fri, 12 Oct 2012 16:26:43 -0400
Mauro Carvalho Chehab 088b329
Subject: [PATCH] snd-tea575x: Fix radio-shark build, when PCI is not compiled
Mauro Carvalho Chehab 088b329
Mauro Carvalho Chehab 088b329
On ARM devices, those vars get undefined:
Mauro Carvalho Chehab 088b329
Mauro Carvalho Chehab 088b329
ERROR: "snd_tea575x_init" [drivers/media/radio/radio-shark.ko] undefined!
Mauro Carvalho Chehab 088b329
ERROR: "snd_tea575x_exit" [drivers/media/radio/radio-shark.ko] undefined!
Mauro Carvalho Chehab 088b329
Mauro Carvalho Chehab 088b329
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Mauro Carvalho Chehab 088b329
Mauro Carvalho Chehab 088b329
diff --git a/sound/Kconfig b/sound/Kconfig
Mauro Carvalho Chehab 088b329
index 261a03c..fef150c 100644
Mauro Carvalho Chehab 088b329
--- a/sound/Kconfig
Mauro Carvalho Chehab 088b329
+++ b/sound/Kconfig
Mauro Carvalho Chehab 088b329
@@ -77,6 +77,12 @@ source "sound/drivers/Kconfig"
Mauro Carvalho Chehab 088b329
 
Mauro Carvalho Chehab 088b329
 source "sound/isa/Kconfig"
Mauro Carvalho Chehab 088b329
 
Mauro Carvalho Chehab 088b329
+# I2C device, used by sound/pci and by some drivers/media USB devices
Mauro Carvalho Chehab 088b329
+config SND_TEA575X
Mauro Carvalho Chehab 088b329
+	tristate
Mauro Carvalho Chehab 088b329
+	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO || RADIO_SHARK
Mauro Carvalho Chehab 088b329
+	default y
Mauro Carvalho Chehab 088b329
+
Mauro Carvalho Chehab 088b329
 source "sound/pci/Kconfig"
Mauro Carvalho Chehab 088b329
 
Mauro Carvalho Chehab 088b329
 source "sound/ppc/Kconfig"
Mauro Carvalho Chehab 088b329
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
Mauro Carvalho Chehab 088b329
index ff3af6e..f93fda7 100644
Mauro Carvalho Chehab 088b329
--- a/sound/pci/Kconfig
Mauro Carvalho Chehab 088b329
+++ b/sound/pci/Kconfig
Mauro Carvalho Chehab 088b329
@@ -1,10 +1,5 @@
Mauro Carvalho Chehab 088b329
 # ALSA PCI drivers
Mauro Carvalho Chehab 088b329
 
Mauro Carvalho Chehab 088b329
-config SND_TEA575X
Mauro Carvalho Chehab 088b329
-	tristate
Mauro Carvalho Chehab 088b329
-	depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2 || RADIO_MAXIRADIO
Mauro Carvalho Chehab 088b329
-	default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2 || RADIO_MAXIRADIO
Mauro Carvalho Chehab 088b329
-
Mauro Carvalho Chehab 088b329
 menuconfig SND_PCI
Mauro Carvalho Chehab 088b329
 	bool "PCI sound devices"
Mauro Carvalho Chehab 088b329
 	depends on PCI
Mauro Carvalho Chehab 088b329
Mauro Carvalho Chehab 088b329
From: Arnd Bergmann <arnd@arndb.de>
Mauro Carvalho Chehab 088b329
Subject: [PATCH] ARM: export read_current_timer
Mauro Carvalho Chehab 088b329
	https://patchwork.kernel.org/patch/1361481/
Mauro Carvalho Chehab 088b329
Mauro Carvalho Chehab 088b329
	read_current_timer is used in the get_cycles() function when
Mauro Carvalho Chehab 088b329
	ARM_ARCH_TIMER is set, and that function can be inlined into
Mauro Carvalho Chehab 088b329
	driver modules, so we should export the function to avoid
Mauro Carvalho Chehab 088b329
	errors like
Mauro Carvalho Chehab 088b329
Mauro Carvalho Chehab 088b329
	ERROR: "read_current_timer" [drivers/video/udlfb.ko] undefined!
Mauro Carvalho Chehab 088b329
	ERROR: "read_current_timer" [crypto/tcrypt.ko] undefined!
Mauro Carvalho Chehab 088b329
Mauro Carvalho Chehab 088b329
	Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Mauro Carvalho Chehab 088b329
	Cc: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
Mauro Carvalho Chehab 088b329
	Cc: Stephen Boyd <sboyd@codeaurora.org>
Mauro Carvalho Chehab 088b329
	Cc: Will Deacon <will.deacon@arm.com>
Mauro Carvalho Chehab 088b329
	Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Mauro Carvalho Chehab 088b329
Mauro Carvalho Chehab 088b329
diff --git a/arch/arm/kernel/arch_timer.c b/arch/arm/kernel/arch_timer.c
Mauro Carvalho Chehab 088b329
index cf25880..6327d1f 100644
Mauro Carvalho Chehab 088b329
--- a/arch/arm/kernel/arch_timer.c
Mauro Carvalho Chehab 088b329
+++ b/arch/arm/kernel/arch_timer.c
Mauro Carvalho Chehab 088b329
@@ -14,6 +14,7 @@
Mauro Carvalho Chehab 088b329
 #include <linux/device.h>
Mauro Carvalho Chehab 088b329
 #include <linux/smp.h>
Mauro Carvalho Chehab 088b329
 #include <linux/cpu.h>
Mauro Carvalho Chehab 088b329
+#include <linux/export.h>
Mauro Carvalho Chehab 088b329
 #include <linux/jiffies.h>
Mauro Carvalho Chehab 088b329
 #include <linux/clockchips.h>
Mauro Carvalho Chehab 088b329
 #include <linux/interrupt.h>
Mauro Carvalho Chehab 088b329
@@ -232,6 +233,7 @@ int read_current_timer(unsigned long *timer_val)
Mauro Carvalho Chehab 088b329
 	*timer_val = arch_counter_get_cntpct();
Mauro Carvalho Chehab 088b329
 	return 0;
Mauro Carvalho Chehab 088b329
 }
Mauro Carvalho Chehab 088b329
+EXPORT_SYMBOL_GPL(read_current_timer);
Mauro Carvalho Chehab 088b329
 
Mauro Carvalho Chehab 088b329
 static struct clocksource clocksource_counter = {
Mauro Carvalho Chehab 088b329
 	.name	= "arch_sys_counter",
Mauro Carvalho Chehab 1a44375
Mauro Carvalho Chehab 1a44375
From: David Cullen <david.cullen@koe-americas.com>
Mauro Carvalho Chehab 1a44375
Subject: [PATCH] Fix error: unknown field reclaim_buffers specified in initializer
Mauro Carvalho Chehab 1a44375
Mauro Carvalho Chehab 1a44375
	The reclaim_buffers field has been removed from struct drm_driver.
Mauro Carvalho Chehab 1a44375
Mauro Carvalho Chehab 1a44375
	Signed-off-by: David Cullen <david.cullen@koe-americas.com>
Mauro Carvalho Chehab 1a44375
diff --git a/drivers/staging/omapdrm/omap_drv.c
Mauro Carvalho Chehab 1a44375
b/drivers/staging/omapdrm/omap_drv.c
Mauro Carvalho Chehab 1a44375
index 4beab94..44149ee 100644
Mauro Carvalho Chehab 1a44375
--- a/drivers/staging/omapdrm/omap_drv.c
Mauro Carvalho Chehab 1a44375
+++ b/drivers/staging/omapdrm/omap_drv.c
Mauro Carvalho Chehab 1a44375
@@ -761,7 +761,6 @@ static struct drm_driver omap_drm_driver = {
c05f8b9
 		.irq_postinstall = dev_irq_postinstall,
c05f8b9
 		.irq_uninstall = dev_irq_uninstall,
c05f8b9
 		.irq_handler = dev_irq_handler,
c05f8b9
-		.reclaim_buffers = drm_core_reclaim_buffers,
Mauro Carvalho Chehab 1a44375
 #ifdef CONFIG_DEBUG_FS
c05f8b9
 		.debugfs_init = omap_debugfs_init,
c05f8b9
 		.debugfs_cleanup = omap_debugfs_cleanup,
Mauro Carvalho Chehab 1a44375