diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-06-09 11:55:06 +0200 |
---|---|---|
committer | Jean-Francois Moine <moinejf@free.fr> | 2008-06-09 11:55:06 +0200 |
commit | a76f49b7ffe277c032fab5226bc092da0b324799 (patch) | |
tree | 47dcbd1db7c6c3f9493092a643c9ee5cfb578def /linux/drivers/media/dvb/ttpci/av7110_ir.c | |
parent | 80fb482585b549df0669ef539d101369fae7a40a (diff) | |
parent | 18e4796addabb3886c9346e035ee30bb96bbcd74 (diff) | |
download | mediapointer-dvb-s2-a76f49b7ffe277c032fab5226bc092da0b324799.tar.gz mediapointer-dvb-s2-a76f49b7ffe277c032fab5226bc092da0b324799.tar.bz2 |
From: Jean-Francois Moine <moinejf@free.fr>
Update from main repository.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110_ir.c')
-rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_ir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c index 9097646a3..18171c051 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_ir.c +++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c @@ -133,7 +133,7 @@ static void av7110_emit_key(unsigned long parm) break; default: - printk("%s invalid protocol %x\n", __FUNCTION__, ir->protocol); + printk("%s invalid protocol %x\n", __func__, ir->protocol); return; } @@ -143,7 +143,7 @@ static void av7110_emit_key(unsigned long parm) keycode = ir->key_map[data]; dprintk(16, "%s: code %08x -> addr %i data 0x%02x -> keycode %i\n", - __FUNCTION__, ircom, addr, data, keycode); + __func__, ircom, addr, data, keycode); /* check device address */ if (!(ir->device_mask & (1 << addr))) @@ -151,7 +151,7 @@ static void av7110_emit_key(unsigned long parm) if (!keycode) { printk ("%s: code %08x -> addr %i data 0x%02x -> unknown key!\n", - __FUNCTION__, ircom, addr, data); + __func__, ircom, addr, data); return; } |