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

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

Merge "ARM: defconfig: Add support for naples sdio for msm8909" into msm-4.9

parents 88ca25aa 9785eb64

arch/arm/configs/msm8909-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -259,7 +259,9 @@ CONFIG_PPPOPNS=y 
CONFIG_PPP_ASYNC=y

CONFIG_PPP_SYNC_TTY=y

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_CLD_LL_CORE=y

CONFIG_CNSS=y

CONFIG_CNSS_SDIO=y

CONFIG_CLD_HL_SDIO_CORE=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_INPUT_JOYSTICK=y
@@ -423,6 +425,7 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_EVENT_TIMER=y

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_CNSS_CRYPTO=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_QTI_MPM=y

arch/arm/configs/msm8909_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -253,7 +253,9 @@ CONFIG_PPPOPNS=y 
CONFIG_PPP_ASYNC=y

CONFIG_PPP_SYNC_TTY=y

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_CLD_LL_CORE=y

CONFIG_CNSS=y

CONFIG_CNSS_SDIO=y

CONFIG_CLD_HL_SDIO_CORE=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

CONFIG_INPUT_JOYSTICK=y
@@ -418,6 +420,7 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_EVENT_TIMER=y

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_CNSS_CRYPTO=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_QTI_MPM=y