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

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

Merge "defconfig: fsm9900: enable the pcie on fsm9900"

parents e7d24054 fb3dc046

arch/arm/configs/fsm9900-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ CONFIG_MSM_MPM_OF=y 
# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMD=y

CONFIG_MSM_PCIE=y

# CONFIG_MSM_SMD_TTY is not set

CONFIG_MSM_IPC_ROUTER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
@@ -69,6 +70,9 @@ CONFIG_MSM_L2_ERP_PORT_PANIC=y 
CONFIG_MSM_L2_ERP_1BIT_PANIC=y

CONFIG_MSM_L2_ERP_2BIT_PANIC=y

CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_PCCARD=y

CONFIG_SMP=y

# CONFIG_SMP_ON_UP is not set

CONFIG_SCHED_MC=y

arch/arm/configs/fsm9900_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ CONFIG_MSM_MPM_OF=y 
# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_SMD=y

CONFIG_MSM_PCIE=y

# CONFIG_MSM_SMD_TTY is not set

CONFIG_MSM_IPC_ROUTER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
@@ -70,6 +71,9 @@ CONFIG_MSM_L2_ERP_2BIT_PANIC=y 
CONFIG_MSM_CACHE_DUMP=y

CONFIG_MSM_CACHE_DUMP_ON_PANIC=y

CONFIG_MSM_ENABLE_WDOG_DEBUG_CONTROL=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_PCCARD=y

CONFIG_SMP=y

# CONFIG_SMP_ON_UP is not set

CONFIG_SCHED_MC=y