aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2007-10-31 00:23:48 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-31 10:48:21 -0400
commitbb374b7b938f73666c403b201b3dd48ec9fe118a (patch)
treef683515d0b6b3b98a67c65c2bce6737089157c2b /drivers/media
parentdd13810b420e0de1fe75bc3b9b14dd2c2c9a4299 (diff)
[MEDIA] IVTV: exit_ivtv_i2c() cannot be __devexit
It is referenced both from __devinit code (ivtv_probe) and normal .text (ivtv_process_eeprom), and therefore cannot be discarded via __devexit. Signed-off-by: David S. Miller <davem@davemloft.net> Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/ivtv/ivtv-i2c.c2
-rw-r--r--drivers/media/video/ivtv/ivtv-i2c.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index 285fca676a69..623eea2652ca 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -741,7 +741,7 @@ int __devinit init_ivtv_i2c(struct ivtv *itv)
741 return i2c_bit_add_bus(&itv->i2c_adap); 741 return i2c_bit_add_bus(&itv->i2c_adap);
742} 742}
743 743
744void __devexit exit_ivtv_i2c(struct ivtv *itv) 744void exit_ivtv_i2c(struct ivtv *itv)
745{ 745{
746 IVTV_DEBUG_I2C("i2c exit\n"); 746 IVTV_DEBUG_I2C("i2c exit\n");
747 747
diff --git a/drivers/media/video/ivtv/ivtv-i2c.h b/drivers/media/video/ivtv/ivtv-i2c.h
index 677c3292855e..de6a07442298 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.h
+++ b/drivers/media/video/ivtv/ivtv-i2c.h
@@ -36,6 +36,6 @@ void ivtv_call_i2c_clients(struct ivtv *itv, unsigned int cmd, void *arg);
36 36
37/* init + register i2c algo-bit adapter */ 37/* init + register i2c algo-bit adapter */
38int __devinit init_ivtv_i2c(struct ivtv *itv); 38int __devinit init_ivtv_i2c(struct ivtv *itv);
39void __devexit exit_ivtv_i2c(struct ivtv *itv); 39void exit_ivtv_i2c(struct ivtv *itv);
40 40
41#endif 41#endif