diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
| commit | 749dfc70554f2c9e6624ac843d66571265ed9338 (patch) | |
| tree | bf591255b3f158222f90852d53c4279e6e7e9ced /drivers/media/dvb/ttpci/av7110_ir.c | |
| parent | 74f5ec29ae93aa42c49f4285c20c457afe937881 (diff) | |
| parent | 0992a5d029181421877a716eaf99145828ff7eae (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110_ir.c')
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110_ir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c index 617e4f6c0ed7..d54bbcdde2cc 100644 --- a/drivers/media/dvb/ttpci/av7110_ir.c +++ b/drivers/media/dvb/ttpci/av7110_ir.c | |||
| @@ -208,7 +208,7 @@ static void ir_handler(struct av7110 *av7110, u32 ircom) | |||
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | 210 | ||
| 211 | int __init av7110_ir_init(struct av7110 *av7110) | 211 | int __devinit av7110_ir_init(struct av7110 *av7110) |
| 212 | { | 212 | { |
| 213 | static struct proc_dir_entry *e; | 213 | static struct proc_dir_entry *e; |
| 214 | 214 | ||
| @@ -248,7 +248,7 @@ int __init av7110_ir_init(struct av7110 *av7110) | |||
| 248 | } | 248 | } |
| 249 | 249 | ||
| 250 | 250 | ||
| 251 | void __exit av7110_ir_exit(struct av7110 *av7110) | 251 | void __devexit av7110_ir_exit(struct av7110 *av7110) |
| 252 | { | 252 | { |
| 253 | int i; | 253 | int i; |
| 254 | 254 | ||