diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-02 14:44:48 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-02 14:44:48 -0200 |
| commit | 243f8ac81736ce89f319eb22a1c220c46b733aeb (patch) | |
| tree | d1d090d5be64cc48058c34bfb8976540e3990e89 /linux/drivers/media | |
| parent | aef90dc656e1d3f29d6cca5dd6fd7d209d81e1df (diff) | |
| download | mediapointer-dvb-s2-243f8ac81736ce89f319eb22a1c220c46b733aeb.tar.gz mediapointer-dvb-s2-243f8ac81736ce89f319eb22a1c220c46b733aeb.tar.bz2 | |
backport changeset bb374b7b938f73666c403b201b3dd48ec9fe118a
kernel-sync:
Author: David Miller <davem@davemloft.net>
Date: Tue Oct 30 21:23:48 2007 -0700
[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: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-i2c.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-i2c.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.c b/linux/drivers/media/video/ivtv/ivtv-i2c.c index d78f2f7fd..6c96bb9bc 100644 --- a/linux/drivers/media/video/ivtv/ivtv-i2c.c +++ b/linux/drivers/media/video/ivtv/ivtv-i2c.c @@ -746,7 +746,7 @@ int __devinit init_ivtv_i2c(struct ivtv *itv) return i2c_bit_add_bus(&itv->i2c_adap); } -void __devexit exit_ivtv_i2c(struct ivtv *itv) +void exit_ivtv_i2c(struct ivtv *itv) { IVTV_DEBUG_I2C("i2c exit\n"); diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.h b/linux/drivers/media/video/ivtv/ivtv-i2c.h index 677c32928..de6a07442 100644 --- a/linux/drivers/media/video/ivtv/ivtv-i2c.h +++ b/linux/drivers/media/video/ivtv/ivtv-i2c.h @@ -36,6 +36,6 @@ void ivtv_call_i2c_clients(struct ivtv *itv, unsigned int cmd, void *arg); /* init + register i2c algo-bit adapter */ int __devinit init_ivtv_i2c(struct ivtv *itv); -void __devexit exit_ivtv_i2c(struct ivtv *itv); +void exit_ivtv_i2c(struct ivtv *itv); #endif |