]> err.no Git - linux-2.6/commitdiff
V4L/DVB (7001): av7110: fix section mismatch
authorRandy Dunlap <randy.dunlap@oracle.com>
Thu, 10 Jan 2008 22:31:47 +0000 (19:31 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 11 Jan 2008 17:02:25 +0000 (15:02 -0200)
Fix driver data name to match whitelist of acceptable names that contain
pointers init data so that section mismatch warning is placated.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/dvb/ttpci/av7110.c

index 8b8144f77a739b7637ce5c9de526c199a3daf389..0d36c155695bcd901febb18571547c9629eb1b1f 100644 (file)
@@ -2800,12 +2800,12 @@ static void av7110_irq(struct saa7146_dev* dev, u32 *isr)
 }
 
 
-static struct saa7146_extension av7110_extension;
+static struct saa7146_extension av7110_extension_driver;
 
 #define MAKE_AV7110_INFO(x_var,x_name) \
 static struct saa7146_pci_extension_data x_var = { \
        .ext_priv = x_name, \
-       .ext = &av7110_extension }
+       .ext = &av7110_extension_driver }
 
 MAKE_AV7110_INFO(tts_1_X_fsc,"Technotrend/Hauppauge WinTV DVB-S rev1.X or Fujitsu Siemens DVB-C");
 MAKE_AV7110_INFO(ttt_1_X,    "Technotrend/Hauppauge WinTV DVB-T rev1.X");
@@ -2843,7 +2843,7 @@ static struct pci_device_id pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, pci_tbl);
 
 
-static struct saa7146_extension av7110_extension = {
+static struct saa7146_extension av7110_extension_driver = {
        .name           = "dvb",
        .flags          = SAA7146_USE_I2C_IRQ,
 
@@ -2860,14 +2860,14 @@ static struct saa7146_extension av7110_extension = {
 static int __init av7110_init(void)
 {
        int retval;
-       retval = saa7146_register_extension(&av7110_extension);
+       retval = saa7146_register_extension(&av7110_extension_driver);
        return retval;
 }
 
 
 static void __exit av7110_exit(void)
 {
-       saa7146_unregister_extension(&av7110_extension);
+       saa7146_unregister_extension(&av7110_extension_driver);
 }
 
 module_init(av7110_init);