From e91bf91655844c5c08dbb6e2a1b13a805b3ae217 Mon Sep 17 00:00:00 2001
From: Johannes Stezenbach <js@linuxtv.org>
Date: Mon, 27 Feb 2006 00:09:20 -0300
Subject: [PATCH] --- yaml --- r: 21679 b: refs/heads/master c:
 1be11e367f25d3874276d56d1c4ffed5b3cc3bb9 h: refs/heads/master i:   21677:
 82aa216d41a620bbc0f63b5ee33cd9549e113c3b   21675:
 798f9f4198b913ea70b1ebd16f2c603fb335c39d   21671:
 f42f270c27c5d87e863c8b626e1755ba58bd73a6   21663:
 c81e885fec54128605225f1a182f40b22d018e8c v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/dvb/ttpci/av7110.c    | 7 ++++---
 trunk/drivers/media/dvb/ttpci/av7110_ir.c | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0dcefcbb87dc..952a77d70273 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 981a16f185bdf105f0d411d87f5c276d3da60e64
+refs/heads/master: 1be11e367f25d3874276d56d1c4ffed5b3cc3bb9
diff --git a/trunk/drivers/media/dvb/ttpci/av7110.c b/trunk/drivers/media/dvb/ttpci/av7110.c
index 1aa61bf29ad6..d982a50cdd7f 100644
--- a/trunk/drivers/media/dvb/ttpci/av7110.c
+++ b/trunk/drivers/media/dvb/ttpci/av7110.c
@@ -2476,7 +2476,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;
@@ -2826,7 +2827,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
 	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);
@@ -2973,7 +2974,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,
diff --git a/trunk/drivers/media/dvb/ttpci/av7110_ir.c b/trunk/drivers/media/dvb/ttpci/av7110_ir.c
index 617e4f6c0ed7..d54bbcdde2cc 100644
--- a/trunk/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/trunk/drivers/media/dvb/ttpci/av7110_ir.c
@@ -208,7 +208,7 @@ static void ir_handler(struct av7110 *av7110, u32 ircom)
 }
 
 
-int __init av7110_ir_init(struct av7110 *av7110)
+int __devinit av7110_ir_init(struct av7110 *av7110)
 {
 	static struct proc_dir_entry *e;
 
@@ -248,7 +248,7 @@ int __init av7110_ir_init(struct av7110 *av7110)
 }
 
 
-void __exit av7110_ir_exit(struct av7110 *av7110)
+void __devexit av7110_ir_exit(struct av7110 *av7110)
 {
 	int i;