aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/rc/Makefile4
-rw-r--r--drivers/media/rc/ir-functions.c2
-rw-r--r--drivers/media/rc/ir-jvc-decoder.c2
-rw-r--r--drivers/media/rc/ir-lirc-codec.c2
-rw-r--r--drivers/media/rc/ir-nec-decoder.c2
-rw-r--r--drivers/media/rc/ir-rc5-decoder.c2
-rw-r--r--drivers/media/rc/ir-rc5-sz-decoder.c2
-rw-r--r--drivers/media/rc/ir-rc6-decoder.c2
-rw-r--r--drivers/media/rc/ir-sony-decoder.c2
-rw-r--r--drivers/media/rc/rc-core-priv.h (renamed from drivers/media/rc/ir-core-priv.h)0
-rw-r--r--drivers/media/rc/rc-main.c (renamed from drivers/media/rc/ir-keytable.c)2
-rw-r--r--drivers/media/rc/rc-raw.c (renamed from drivers/media/rc/ir-raw-event.c)2
-rw-r--r--drivers/media/rc/rc-sysfs.c (renamed from drivers/media/rc/ir-sysfs.c)2
13 files changed, 13 insertions, 13 deletions
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 38873cff342..479a8f4c3a9 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -1,9 +1,9 @@
1ir-common-objs := ir-functions.o 1ir-common-objs := ir-functions.o
2ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o 2rc-core-objs := rc-main.o rc-sysfs.o rc-raw.o rc-map.o
3 3
4obj-y += keymaps/ 4obj-y += keymaps/
5 5
6obj-$(CONFIG_IR_CORE) += ir-core.o 6obj-$(CONFIG_IR_CORE) += rc-core.o
7obj-$(CONFIG_IR_LEGACY) += ir-common.o 7obj-$(CONFIG_IR_LEGACY) += ir-common.o
8obj-$(CONFIG_LIRC) += lirc_dev.o 8obj-$(CONFIG_LIRC) += lirc_dev.o
9obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o 9obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
diff --git a/drivers/media/rc/ir-functions.c b/drivers/media/rc/ir-functions.c
index ec021c92527..14397d0541d 100644
--- a/drivers/media/rc/ir-functions.c
+++ b/drivers/media/rc/ir-functions.c
@@ -24,7 +24,7 @@
24#include <linux/string.h> 24#include <linux/string.h>
25#include <linux/jiffies.h> 25#include <linux/jiffies.h>
26#include <media/ir-common.h> 26#include <media/ir-common.h>
27#include "ir-core-priv.h" 27#include "rc-core-priv.h"
28 28
29/* -------------------------------------------------------------------------- */ 29/* -------------------------------------------------------------------------- */
30 30
diff --git a/drivers/media/rc/ir-jvc-decoder.c b/drivers/media/rc/ir-jvc-decoder.c
index 63dca6e5458..d83a5f64bfe 100644
--- a/drivers/media/rc/ir-jvc-decoder.c
+++ b/drivers/media/rc/ir-jvc-decoder.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include <linux/bitrev.h> 15#include <linux/bitrev.h>
16#include "ir-core-priv.h" 16#include "rc-core-priv.h"
17 17
18#define JVC_NBITS 16 /* dev(8) + func(8) */ 18#define JVC_NBITS 16 /* dev(8) + func(8) */
19#define JVC_UNIT 525000 /* ns */ 19#define JVC_UNIT 525000 /* ns */
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index 9fc0db9d344..9345995dbf1 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -17,7 +17,7 @@
17#include <media/lirc.h> 17#include <media/lirc.h>
18#include <media/lirc_dev.h> 18#include <media/lirc_dev.h>
19#include <media/ir-core.h> 19#include <media/ir-core.h>
20#include "ir-core-priv.h" 20#include "rc-core-priv.h"
21 21
22#define LIRCBUF_SIZE 256 22#define LIRCBUF_SIZE 256
23 23
diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
index 70993f79c8a..cad4e994aa7 100644
--- a/drivers/media/rc/ir-nec-decoder.c
+++ b/drivers/media/rc/ir-nec-decoder.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include <linux/bitrev.h> 15#include <linux/bitrev.h>
16#include "ir-core-priv.h" 16#include "rc-core-priv.h"
17 17
18#define NEC_NBITS 32 18#define NEC_NBITS 32
19#define NEC_UNIT 562500 /* ns */ 19#define NEC_UNIT 562500 /* ns */
diff --git a/drivers/media/rc/ir-rc5-decoder.c b/drivers/media/rc/ir-rc5-decoder.c
index 572ed4ca8c6..c07f6e0bb96 100644
--- a/drivers/media/rc/ir-rc5-decoder.c
+++ b/drivers/media/rc/ir-rc5-decoder.c
@@ -20,7 +20,7 @@
20 * the first two bits are start bits, and a third one is a filing bit 20 * the first two bits are start bits, and a third one is a filing bit
21 */ 21 */
22 22
23#include "ir-core-priv.h" 23#include "rc-core-priv.h"
24 24
25#define RC5_NBITS 14 25#define RC5_NBITS 14
26#define RC5X_NBITS 20 26#define RC5X_NBITS 20
diff --git a/drivers/media/rc/ir-rc5-sz-decoder.c b/drivers/media/rc/ir-rc5-sz-decoder.c
index 7c413501a3f..0c3b6eb4ccd 100644
--- a/drivers/media/rc/ir-rc5-sz-decoder.c
+++ b/drivers/media/rc/ir-rc5-sz-decoder.c
@@ -20,7 +20,7 @@
20 * the first two bits are start bits, and a third one is a filing bit 20 * the first two bits are start bits, and a third one is a filing bit
21 */ 21 */
22 22
23#include "ir-core-priv.h" 23#include "rc-core-priv.h"
24 24
25#define RC5_SZ_NBITS 15 25#define RC5_SZ_NBITS 15
26#define RC5_UNIT 888888 /* ns */ 26#define RC5_UNIT 888888 /* ns */
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
index d25da91f44f..48e82be5e01 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -12,7 +12,7 @@
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 */ 13 */
14 14
15#include "ir-core-priv.h" 15#include "rc-core-priv.h"
16 16
17/* 17/*
18 * This decoder currently supports: 18 * This decoder currently supports:
diff --git a/drivers/media/rc/ir-sony-decoder.c b/drivers/media/rc/ir-sony-decoder.c
index 2d15730822b..0a5cadbf9bf 100644
--- a/drivers/media/rc/ir-sony-decoder.c
+++ b/drivers/media/rc/ir-sony-decoder.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include <linux/bitrev.h> 15#include <linux/bitrev.h>
16#include "ir-core-priv.h" 16#include "rc-core-priv.h"
17 17
18#define SONY_UNIT 600000 /* ns */ 18#define SONY_UNIT 600000 /* ns */
19#define SONY_HEADER_PULSE (4 * SONY_UNIT) 19#define SONY_HEADER_PULSE (4 * SONY_UNIT)
diff --git a/drivers/media/rc/ir-core-priv.h b/drivers/media/rc/rc-core-priv.h
index 81c936bd793..81c936bd793 100644
--- a/drivers/media/rc/ir-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
diff --git a/drivers/media/rc/ir-keytable.c b/drivers/media/rc/rc-main.c
index 8039110350d..d6de2e25315 100644
--- a/drivers/media/rc/ir-keytable.c
+++ b/drivers/media/rc/rc-main.c
@@ -15,7 +15,7 @@
15 15
16#include <linux/input.h> 16#include <linux/input.h>
17#include <linux/slab.h> 17#include <linux/slab.h>
18#include "ir-core-priv.h" 18#include "rc-core-priv.h"
19 19
20/* Sizes are in bytes, 256 bytes allows for 32 entries on x64 */ 20/* Sizes are in bytes, 256 bytes allows for 32 entries on x64 */
21#define IR_TAB_MIN_SIZE 256 21#define IR_TAB_MIN_SIZE 256
diff --git a/drivers/media/rc/ir-raw-event.c b/drivers/media/rc/rc-raw.c
index a06a07e4e0b..d6c556e3f0d 100644
--- a/drivers/media/rc/ir-raw-event.c
+++ b/drivers/media/rc/rc-raw.c
@@ -16,7 +16,7 @@
16#include <linux/mutex.h> 16#include <linux/mutex.h>
17#include <linux/sched.h> 17#include <linux/sched.h>
18#include <linux/freezer.h> 18#include <linux/freezer.h>
19#include "ir-core-priv.h" 19#include "rc-core-priv.h"
20 20
21/* Define the max number of pulse/space transitions to buffer */ 21/* Define the max number of pulse/space transitions to buffer */
22#define MAX_IR_EVENT_SIZE 512 22#define MAX_IR_EVENT_SIZE 512
diff --git a/drivers/media/rc/ir-sysfs.c b/drivers/media/rc/rc-sysfs.c
index 38423a8da87..a5f81d107ed 100644
--- a/drivers/media/rc/ir-sysfs.c
+++ b/drivers/media/rc/rc-sysfs.c
@@ -15,7 +15,7 @@
15#include <linux/slab.h> 15#include <linux/slab.h>
16#include <linux/input.h> 16#include <linux/input.h>
17#include <linux/device.h> 17#include <linux/device.h>
18#include "ir-core-priv.h" 18#include "rc-core-priv.h"
19 19
20#define IRRCV_NUM_DEVICES 256 20#define IRRCV_NUM_DEVICES 256
21 21
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-21 11:04:43 -0400