diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-04 08:23:44 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-04 08:23:44 -0300 |
| commit | e5108b164b4e23e5d70b3db8ed6da9479366d289 (patch) | |
| tree | 7f38b0a749b3082567017491a06ad1a8519c272c /linux/drivers/media/common | |
| parent | cc7536722d24a3deec8ac51616e26f5dc267f112 (diff) | |
| parent | 9fea63f4c39cf81e86921ea4a0c440029f6d49b9 (diff) | |
| download | mediapointer-dvb-s2-e5108b164b4e23e5d70b3db8ed6da9479366d289.tar.gz mediapointer-dvb-s2-e5108b164b4e23e5d70b3db8ed6da9479366d289.tar.bz2 | |
merge from http://linuxtv.org/hg/~mkrufky/trivial
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/ir-functions.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/common/ir-keymaps.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/common/ir-functions.c b/linux/drivers/media/common/ir-functions.c index 8b7dd6e3e..3b988b012 100644 --- a/linux/drivers/media/common/ir-functions.c +++ b/linux/drivers/media/common/ir-functions.c @@ -278,4 +278,3 @@ EXPORT_SYMBOL_GPL(ir_decode_pulsedistance); * c-basic-offset: 8 * End: */ - diff --git a/linux/drivers/media/common/ir-keymaps.c b/linux/drivers/media/common/ir-keymaps.c index 03c4a7c50..1cdd5b0df 100644 --- a/linux/drivers/media/common/ir-keymaps.c +++ b/linux/drivers/media/common/ir-keymaps.c @@ -1476,4 +1476,3 @@ IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE] = { }; EXPORT_SYMBOL_GPL(ir_codes_hauppauge_new); - |