2007-01-06 02:32:43

by Chris Wright

[permalink] [raw]
Subject: [patch 41/50] V4L: cx88: Fix leadtek_eeprom tagging

-stable review patch. If anyone has any objections, please let us know.
------------------

From: Jean Delvare <[email protected]>

reference to .init.text: from .text between 'cx88_card_setup'
(at offset 0x68c) and 'cx88_risc_field'
Caused by leadtek_eeprom() being declared __devinit and called from
a non-devinit context.

Signed-off-by: Jean Delvare <[email protected]>
Signed-off-by: Michael Krufky <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
(cherry picked from commit 69f7e75a9d45e5eaca16917a8d0dedf76149f13f)

drivers/media/video/cx88/cx88-cards.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.19.1.orig/drivers/media/video/cx88/cx88-cards.c
+++ linux-2.6.19.1/drivers/media/video/cx88/cx88-cards.c
@@ -1610,7 +1610,7 @@ const unsigned int cx88_idcount = ARRAY_
/* ----------------------------------------------------------------------- */
/* some leadtek specific stuff */

-static void __devinit leadtek_eeprom(struct cx88_core *core, u8 *eeprom_data)
+static void leadtek_eeprom(struct cx88_core *core, u8 *eeprom_data)
{
/* This is just for the "Winfast 2000XP Expert" board ATM; I don't have data on
* any others.

--