diff options
| -rw-r--r-- | drivers/media/cec/Makefile | 16 | ||||
| -rw-r--r-- | drivers/media/cec/core/Makefile | 16 | ||||
| -rw-r--r-- | drivers/media/cec/core/cec-adap.c (renamed from drivers/media/cec/cec-adap.c) | 0 | ||||
| -rw-r--r-- | drivers/media/cec/core/cec-api.c (renamed from drivers/media/cec/cec-api.c) | 0 | ||||
| -rw-r--r-- | drivers/media/cec/core/cec-core.c (renamed from drivers/media/cec/cec-core.c) | 0 | ||||
| -rw-r--r-- | drivers/media/cec/core/cec-notifier.c (renamed from drivers/media/cec/cec-notifier.c) | 0 | ||||
| -rw-r--r-- | drivers/media/cec/core/cec-pin-error-inj.c (renamed from drivers/media/cec/cec-pin-error-inj.c) | 0 | ||||
| -rw-r--r-- | drivers/media/cec/core/cec-pin-priv.h (renamed from drivers/media/cec/cec-pin-priv.h) | 0 | ||||
| -rw-r--r-- | drivers/media/cec/core/cec-pin.c (renamed from drivers/media/cec/cec-pin.c) | 0 | ||||
| -rw-r--r-- | drivers/media/cec/core/cec-priv.h (renamed from drivers/media/cec/cec-priv.h) | 0 |
10 files changed, 17 insertions, 15 deletions
diff --git a/drivers/media/cec/Makefile b/drivers/media/cec/Makefile index ad8677d8c896..3fdbc22b1530 100644 --- a/drivers/media/cec/Makefile +++ b/drivers/media/cec/Makefile @@ -1,16 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 -cec-objs := cec-core.o cec-adap.o cec-api.o - -ifeq ($(CONFIG_CEC_NOTIFIER),y) - cec-objs += cec-notifier.o -endif - -ifeq ($(CONFIG_CEC_PIN),y) - cec-objs += cec-pin.o -endif - -ifeq ($(CONFIG_CEC_PIN_ERROR_INJ),y) - cec-objs += cec-pin-error-inj.o -endif - -obj-$(CONFIG_CEC_CORE) += cec.o +obj-y += core/ diff --git a/drivers/media/cec/core/Makefile b/drivers/media/cec/core/Makefile new file mode 100644 index 000000000000..ad8677d8c896 --- /dev/null +++ b/drivers/media/cec/core/Makefile @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0 +cec-objs := cec-core.o cec-adap.o cec-api.o + +ifeq ($(CONFIG_CEC_NOTIFIER),y) + cec-objs += cec-notifier.o +endif + +ifeq ($(CONFIG_CEC_PIN),y) + cec-objs += cec-pin.o +endif + +ifeq ($(CONFIG_CEC_PIN_ERROR_INJ),y) + cec-objs += cec-pin-error-inj.o +endif + +obj-$(CONFIG_CEC_CORE) += cec.o diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/core/cec-adap.c index 6c95dc471d4c..6c95dc471d4c 100644 --- a/drivers/media/cec/cec-adap.c +++ b/drivers/media/cec/core/cec-adap.c diff --git a/drivers/media/cec/cec-api.c b/drivers/media/cec/core/cec-api.c index 17d1cb2e5f97..17d1cb2e5f97 100644 --- a/drivers/media/cec/cec-api.c +++ b/drivers/media/cec/core/cec-api.c diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/core/cec-core.c index 0c52e1bb3910..0c52e1bb3910 100644 --- a/drivers/media/cec/cec-core.c +++ b/drivers/media/cec/core/cec-core.c diff --git a/drivers/media/cec/cec-notifier.c b/drivers/media/cec/core/cec-notifier.c index e748cd54b45d..e748cd54b45d 100644 --- a/drivers/media/cec/cec-notifier.c +++ b/drivers/media/cec/core/cec-notifier.c diff --git a/drivers/media/cec/cec-pin-error-inj.c b/drivers/media/cec/core/cec-pin-error-inj.c index c0088d3b8e3d..c0088d3b8e3d 100644 --- a/drivers/media/cec/cec-pin-error-inj.c +++ b/drivers/media/cec/core/cec-pin-error-inj.c diff --git a/drivers/media/cec/cec-pin-priv.h b/drivers/media/cec/core/cec-pin-priv.h index f423db8855d9..f423db8855d9 100644 --- a/drivers/media/cec/cec-pin-priv.h +++ b/drivers/media/cec/core/cec-pin-priv.h diff --git a/drivers/media/cec/cec-pin.c b/drivers/media/cec/core/cec-pin.c index 660fe111f540..660fe111f540 100644 --- a/drivers/media/cec/cec-pin.c +++ b/drivers/media/cec/core/cec-pin.c diff --git a/drivers/media/cec/cec-priv.h b/drivers/media/cec/core/cec-priv.h index 9bbd05053d42..9bbd05053d42 100644 --- a/drivers/media/cec/cec-priv.h +++ b/drivers/media/cec/core/cec-priv.h |