diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-04-03 01:11:45 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 17:56:51 +0200 |
| commit | bd7261d3d7dfe61e8bf8945051c1905ba4dba3b5 (patch) | |
| tree | b2a8af995e809da87f04b9a783593f936cf29952 /drivers | |
| parent | V4L/DVB: ir-core: Make use of the new IR keymap modules (diff) | |
| download | linux-bd7261d3d7dfe61e8bf8945051c1905ba4dba3b5.tar.xz linux-bd7261d3d7dfe61e8bf8945051c1905ba4dba3b5.zip | |
V4L/DVB: ir-common: remove keymap tables from the module
Now that the remote keymaps were broken into separate modules,
get rid of the keycode tables that were hardcoded into ir-common.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/IR/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/IR/ir-keymaps.c | 45 |
2 files changed, 1 insertions, 46 deletions
diff --git a/drivers/media/IR/Makefile b/drivers/media/IR/Makefile index 3d8dd306df46..0e3f912054ca 100644 --- a/drivers/media/IR/Makefile +++ b/drivers/media/IR/Makefile @@ -1,4 +1,4 @@ -ir-common-objs := ir-functions.o ir-keymaps.o +ir-common-objs := ir-functions.o ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o obj-y += keymaps/ diff --git a/drivers/media/IR/ir-keymaps.c b/drivers/media/IR/ir-keymaps.c deleted file mode 100644 index eb2553192789..000000000000 --- a/drivers/media/IR/ir-keymaps.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - Keytables for supported remote controls, used on drivers/media - devices. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#define IR_KEYMAPS - -/* - * NOTICE FOR DEVELOPERS: - * The IR mappings should be as close as possible to what's - * specified at: - * http://linuxtv.org/wiki/index.php/Remote_Controllers - * - * The usage of tables with just the command part is deprecated. - * All new IR keytables should contain address+command and need - * to define the proper IR_TYPE (IR_TYPE_RC5/IR_TYPE_NEC). - * The deprecated tables should use IR_TYPE_UNKNOWN - */ -#include <linux/module.h> - -#include <linux/input.h> -#include <media/ir-common.h> - -/* - * All keytables got moved to include/media/keytables directory. - * This file is still needed - at least for now, as their data is - * dynamically inserted here by the media/ir-common.h, due to the - * #define IR_KEYMAPS line, at the beginning of this file. The - * plans are to get rid of this file completely in a near future. - */ - |