Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58c37704 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "misc: Rename drivers/misc/qti to drivers/misc/qcom"

parents e24a04d5 4c823dd7

drivers/misc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -618,5 +618,5 @@ source "drivers/misc/carma/Kconfig" 
source "drivers/misc/altera-stapl/Kconfig"

source "drivers/misc/mei/Kconfig"

source "drivers/misc/vmw_vmci/Kconfig"

source "drivers/misc/qti/Kconfig"

source "drivers/misc/qcom/Kconfig"

endmenu

drivers/misc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -62,4 +62,4 @@ obj-$(CONFIG_QFP_FUSE) += qfp_fuse.o 
obj-$(CONFIG_TI_DRV2667) += ti_drv2667.o

obj-$(CONFIG_QPNP_MISC) += qpnp-misc.o

obj-$(CONFIG_APQ8084_DOCKING_STATION)	+= apq8084_dock.o

obj-y				+= qti/
 
obj-y				+= qcom/

drivers/misc/qti/Kconfig→drivers/misc/qcom/Kconfig

+0 −0

File moved.

View file

drivers/misc/qti/Makefile→drivers/misc/qcom/Makefile

+0 −0

File moved.

View file