diff options
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/char/Makefile | 2 | ||||
| -rw-r--r-- | drivers/char/imx_amp/Kconfig (renamed from drivers/char/imx_mcc/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/char/imx_amp/Makefile (renamed from drivers/char/imx_mcc/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/char/imx_amp/imx_sema4.c (renamed from drivers/char/imx_mcc/imx_sema4.c) | 1 |
5 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index d45e8c3a9d48..4389d37d8515 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -615,6 +615,6 @@ config TILE_SROM device appear much like a simple EEPROM, and knows how to partition a single ROM for multiple purposes. -source "drivers/char/imx_mcc/Kconfig" +source "drivers/char/imx_amp/Kconfig" endmenu diff --git a/drivers/char/Makefile b/drivers/char/Makefile index b821c4bd86d0..286bb31db5a0 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -62,4 +62,4 @@ obj-$(CONFIG_JS_RTC) += js-rtc.o js-rtc-y = rtc.o obj-$(CONFIG_TILE_SROM) += tile-srom.o -obj-$(CONFIG_HAVE_IMX_MCC) += imx_mcc/ +obj-$(CONFIG_HAVE_IMX_AMP) += imx_amp/ diff --git a/drivers/char/imx_mcc/Kconfig b/drivers/char/imx_amp/Kconfig index 1f892f8daccb..1f892f8daccb 100644 --- a/drivers/char/imx_mcc/Kconfig +++ b/drivers/char/imx_amp/Kconfig diff --git a/drivers/char/imx_mcc/Makefile b/drivers/char/imx_amp/Makefile index 4e7a91691b39..4e7a91691b39 100644 --- a/drivers/char/imx_mcc/Makefile +++ b/drivers/char/imx_amp/Makefile diff --git a/drivers/char/imx_mcc/imx_sema4.c b/drivers/char/imx_amp/imx_sema4.c index 24bb6d74ca82..4228eb5b87ce 100644 --- a/drivers/char/imx_mcc/imx_sema4.c +++ b/drivers/char/imx_amp/imx_sema4.c @@ -16,7 +16,6 @@ #include <linux/io.h> #include <linux/err.h> #include <linux/mcc_config_linux.h> -#include <linux/mcc_common.h> #include <linux/module.h> #include <linux/of.h> #include <linux/wait.h> |