diff options
Diffstat (limited to 'drivers/media/IR')
-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 @@ | |||
1 | ir-common-objs := ir-functions.o ir-keymaps.o | 1 | ir-common-objs := ir-functions.o |
2 | ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o | 2 | ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o |
3 | 3 | ||
4 | obj-y += keymaps/ | 4 | 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 @@ | |||
1 | /* | ||
2 | Keytables for supported remote controls, used on drivers/media | ||
3 | devices. | ||
4 | |||
5 | This program is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published by | ||
7 | the Free Software Foundation; either version 2 of the License, or | ||
8 | (at your option) any later version. | ||
9 | |||
10 | This program is distributed in the hope that it will be useful, | ||
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | GNU General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with this program; if not, write to the Free Software | ||
17 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
18 | */ | ||
19 | |||
20 | #define IR_KEYMAPS | ||
21 | |||
22 | /* | ||
23 | * NOTICE FOR DEVELOPERS: | ||
24 | * The IR mappings should be as close as possible to what's | ||
25 | * specified at: | ||
26 | * http://linuxtv.org/wiki/index.php/Remote_Controllers | ||
27 | * | ||
28 | * The usage of tables with just the command part is deprecated. | ||
29 | * All new IR keytables should contain address+command and need | ||
30 | * to define the proper IR_TYPE (IR_TYPE_RC5/IR_TYPE_NEC). | ||
31 | * The deprecated tables should use IR_TYPE_UNKNOWN | ||
32 | */ | ||
33 | #include <linux/module.h> | ||
34 | |||
35 | #include <linux/input.h> | ||
36 | #include <media/ir-common.h> | ||
37 | |||
38 | /* | ||
39 | * All keytables got moved to include/media/keytables directory. | ||
40 | * This file is still needed - at least for now, as their data is | ||
41 | * dynamically inserted here by the media/ir-common.h, due to the | ||
42 | * #define IR_KEYMAPS line, at the beginning of this file. The | ||
43 | * plans are to get rid of this file completely in a near future. | ||
44 | */ | ||
45 | |||