Merge branch 'work-fixes'

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index d36369e9e88f..cdf7b2c33ad0 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2477,7 +2477,8 @@ static int frontend_init(struct av7110 *av7110)
  * The same behaviour of missing VSYNC can be duplicated on budget
  * cards, by seting DD1_INIT trigger mode 7 in 3rd nibble.
  */
-static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext)
+static int __devinit av7110_attach(struct saa7146_dev* dev,
+                                   struct saa7146_pci_extension_data *pci_ext)
 {
         const int length = TS_WIDTH * TS_HEIGHT;
         struct pci_dev *pdev = dev->pci;
@@ -2827,7 +2828,7 @@ err_kfree_0:
         goto out;
 }
 
-static int av7110_detach(struct saa7146_dev* saa)
+static int __devexit av7110_detach(struct saa7146_dev* saa)
 {
         struct av7110 *av7110 = saa->ext_priv;
         dprintk(4, "%p\n", av7110);
@@ -2974,7 +2975,7 @@ static struct saa7146_extension av7110_extension = {
         .module         = THIS_MODULE,
         .pci_tbl        = &pci_tbl[0],
         .attach         = av7110_attach,
-        .detach         = av7110_detach,
+        .detach         = __devexit_p(av7110_detach),
 
         .irq_mask       = MASK_19 | MASK_03 | MASK_10,
         .irq_func       = av7110_irq,