diff options
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/platform/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/platform/mediatek/mtk-mdp/Makefile | 2 | ||||
| -rw-r--r-- | drivers/media/platform/mediatek/mtk-vpu/Kconfig (renamed from drivers/media/platform/mtk-vpu/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/media/platform/mediatek/mtk-vpu/Makefile (renamed from drivers/media/platform/mtk-vpu/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c (renamed from drivers/media/platform/mtk-vpu/mtk_vpu.c) | 0 | ||||
| -rw-r--r-- | drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h (renamed from drivers/media/platform/mtk-vpu/mtk_vpu.h) | 0 |
7 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 10055af0c7f8..a9ad0c3bd0cc 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -81,7 +81,7 @@ source "drivers/media/platform/marvell/Kconfig" source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig" source "drivers/media/platform/mediatek/mtk-mdp/Kconfig" source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig" -source "drivers/media/platform/mtk-vpu/Kconfig" +source "drivers/media/platform/mediatek/mtk-vpu/Kconfig" source "drivers/media/platform/nxp/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/omap3isp/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 637a3a7ac036..954ad8f2cde1 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -21,7 +21,7 @@ obj-y += marvell/ obj-y += mediatek/mtk-jpeg/ obj-y += mediatek/mtk-mdp/ obj-y += mediatek/mtk-vcodec/ -obj-y += mtk-vpu/ +obj-y += mediatek/mtk-vpu/ obj-y += nxp/ obj-y += omap/ obj-y += omap3isp/ diff --git a/drivers/media/platform/mediatek/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile index 5982d65c9971..eab6f984aeea 100644 --- a/drivers/media/platform/mediatek/mtk-mdp/Makefile +++ b/drivers/media/platform/mediatek/mtk-mdp/Makefile @@ -7,4 +7,4 @@ mtk-mdp-y += mtk_mdp_vpu.o obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp.o -ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu +ccflags-y += -I$(srctree)/drivers/media/platform/mediatek/mtk-vpu diff --git a/drivers/media/platform/mtk-vpu/Kconfig b/drivers/media/platform/mediatek/mtk-vpu/Kconfig index df679ea79ed0..df679ea79ed0 100644 --- a/drivers/media/platform/mtk-vpu/Kconfig +++ b/drivers/media/platform/mediatek/mtk-vpu/Kconfig diff --git a/drivers/media/platform/mtk-vpu/Makefile b/drivers/media/platform/mediatek/mtk-vpu/Makefile index ecd2d392b818..ecd2d392b818 100644 --- a/drivers/media/platform/mtk-vpu/Makefile +++ b/drivers/media/platform/mediatek/mtk-vpu/Makefile diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c index 47b684b92f81..47b684b92f81 100644 --- a/drivers/media/platform/mtk-vpu/mtk_vpu.c +++ b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.h b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h index a56053ff135a..a56053ff135a 100644 --- a/drivers/media/platform/mtk-vpu/mtk_vpu.h +++ b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h |