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

Commit 784b23dd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: defconfig: Disable PCI for bengal"

parents f364d75e be597f03

arch/arm64/configs/vendor/bengal-perf_defconfig

+0 −25
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ CONFIG_PROFILING=y 
CONFIG_HOTPLUG_SIZE_BITS=29

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_BENGAL=y

CONFIG_PCI=y

CONFIG_SCHED_MC=y

CONFIG_NR_CPUS=8

CONFIG_HZ_100=y
@@ -298,37 +297,16 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_TUN=y

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_ADAPTEC is not set

# CONFIG_NET_VENDOR_AGERE is not set

# CONFIG_NET_VENDOR_ALTEON is not set

# CONFIG_NET_VENDOR_AMAZON is not set

# CONFIG_NET_VENDOR_AURORA is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CISCO is not set

# CONFIG_NET_VENDOR_DEC is not set

# CONFIG_NET_VENDOR_DLINK is not set

# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HISILICON is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MELLANOX is not set

# CONFIG_NET_VENDOR_MYRI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NVIDIA is not set

# CONFIG_NET_VENDOR_OKI is not set

# CONFIG_NET_VENDOR_QLOGIC is not set

CONFIG_RMNET=y

# CONFIG_NET_VENDOR_RDC is not set

# CONFIG_NET_VENDOR_REALTEK is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SILAN is not set

# CONFIG_NET_VENDOR_SIS is not set

# CONFIG_NET_VENDOR_SUN is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_TEHUTI is not set

# CONFIG_NET_VENDOR_TI is not set

CONFIG_PHYLIB=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y
@@ -366,8 +344,6 @@ CONFIG_SERIAL_MSM_GENI=y 
CONFIG_SERIAL_MSM_GENI_HALF_SAMPLING=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MSM_LEGACY=y

# CONFIG_HW_RANDOM_CAVIUM is not set

# CONFIG_DEVPORT is not set

CONFIG_DIAG_CHAR=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=m
@@ -438,7 +414,6 @@ CONFIG_LOGO=y 
CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

# CONFIG_SND_PCI is not set

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_USB_AUDIO_QMI=y

CONFIG_SND_SOC=y

arch/arm64/configs/vendor/bengal_defconfig

+0 −25
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ CONFIG_HOTPLUG_SIZE_BITS=29 
CONFIG_ARCH_QCOM=y

CONFIG_ARCH_BENGAL=y

CONFIG_ARCH_SCUBA=y

CONFIG_PCI=y

CONFIG_SCHED_MC=y

CONFIG_NR_CPUS=8

CONFIG_HZ_100=y
@@ -309,36 +308,15 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_TUN=y

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_ADAPTEC is not set

# CONFIG_NET_VENDOR_AGERE is not set

# CONFIG_NET_VENDOR_ALTEON is not set

# CONFIG_NET_VENDOR_AURORA is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CISCO is not set

# CONFIG_NET_VENDOR_DEC is not set

# CONFIG_NET_VENDOR_DLINK is not set

# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_HISILICON is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MELLANOX is not set

# CONFIG_NET_VENDOR_MYRI is not set

# CONFIG_NET_VENDOR_NETRONOME is not set

# CONFIG_NET_VENDOR_NVIDIA is not set

# CONFIG_NET_VENDOR_OKI is not set

# CONFIG_NET_VENDOR_QLOGIC is not set

CONFIG_RMNET=y

# CONFIG_NET_VENDOR_RDC is not set

# CONFIG_NET_VENDOR_REALTEK is not set

# CONFIG_NET_VENDOR_ROCKER is not set

# CONFIG_NET_VENDOR_SILAN is not set

# CONFIG_NET_VENDOR_SIS is not set

# CONFIG_NET_VENDOR_SUN is not set

# CONFIG_NET_VENDOR_SYNOPSYS is not set

# CONFIG_NET_VENDOR_TEHUTI is not set

# CONFIG_NET_VENDOR_TI is not set

CONFIG_PHYLIB=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y
@@ -378,8 +356,6 @@ CONFIG_SERIAL_MSM_GENI_HALF_SAMPLING=y 
CONFIG_TTY_PRINTK=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MSM_LEGACY=y

# CONFIG_HW_RANDOM_CAVIUM is not set

# CONFIG_DEVPORT is not set

CONFIG_DIAG_CHAR=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=m
@@ -451,7 +427,6 @@ CONFIG_LOGO=y 
CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

# CONFIG_SND_PCI is not set

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_USB_AUDIO_QMI=y

CONFIG_SND_SOC=y

drivers/platform/msm/ipa/ipa_api.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 


#if defined(CONFIG_IPA_EMULATION)

static bool running_emulation = true;

#else

#elif defined(CONFIG_PCI)

static bool running_emulation;

#endif