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

Commit 487a9cbb authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sdm845: disable wil_driver" into msm-4.8

parents eeb31110 ecee71f0

arch/arm64/configs/sdm845-perf_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ CONFIG_PPP_BSDCOMP=y 
CONFIG_PPP_DEFLATE=y

CONFIG_PPP_MPPE=y

CONFIG_USB_USBNET=y

CONFIG_WIL6210=m

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set
@@ -277,7 +276,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y 
CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SPECTRA_CAMERA=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_VIDC_VMEM=y

CONFIG_MSM_VIDC_GOVERNORS=y

arch/arm64/configs/sdm845_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ CONFIG_PPP=y 
CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_MPPE=y

CONFIG_WIL6210=m

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set
@@ -284,7 +283,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y 
CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SPECTRA_CAMERA=y

CONFIG_MSM_VIDC_V4L2=y

CONFIG_MSM_VIDC_VMEM=y

CONFIG_MSM_VIDC_GOVERNORS=y