Merge "defconfig: fsm9900: Add EMAC and CE support" (68614777) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

arch/arm/configs/fsm9900-perf_defconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,9 +42,7 @@ CONFIG_MSM_MPM_OF=y
		# CONFIG_MSM_STACKED_MEMORY is not set
		CONFIG_CPU_HAS_L2_PMU=y
		# CONFIG_MSM_FIQ_SUPPORT is not set
		# CONFIG_MSM_PROC_COMM is not set
		CONFIG_MSM_SMD=y
		CONFIG_MSM_SMD_PKG4=y
		CONFIG_MSM_IPC_LOGGING=y
		# CONFIG_MSM_SMD_TTY is not set
		CONFIG_MSM_IPC_ROUTER=y
		@@ -127,6 +125,8 @@ CONFIG_TUN=y
		# CONFIG_NET_VENDOR_MARVELL is not set
		# CONFIG_NET_VENDOR_MICREL is not set
		# CONFIG_NET_VENDOR_MICROCHIP is not set
		CONFIG_NET_VENDOR_MSM=y
		CONFIG_MSM_EMAC=y
		# CONFIG_MSM_RMNET is not set
		# CONFIG_NET_VENDOR_NATSEMI is not set
		# CONFIG_NET_VENDOR_STMICRO is not set

+5 −5

Original line number	Diff line number	Diff line
		@@ -41,9 +41,7 @@ CONFIG_MSM_MPM_OF=y
		# CONFIG_MSM_STACKED_MEMORY is not set
		CONFIG_CPU_HAS_L2_PMU=y
		# CONFIG_MSM_FIQ_SUPPORT is not set
		# CONFIG_MSM_PROC_COMM is not set
		CONFIG_MSM_SMD=y
		CONFIG_MSM_SMD_PKG4=y
		CONFIG_MSM_IPC_LOGGING=y
		# CONFIG_MSM_SMD_TTY is not set
		CONFIG_MSM_IPC_ROUTER=y
		@@ -128,6 +126,8 @@ CONFIG_TUN=y
		# CONFIG_NET_VENDOR_MARVELL is not set
		# CONFIG_NET_VENDOR_MICREL is not set
		# CONFIG_NET_VENDOR_MICROCHIP is not set
		CONFIG_NET_VENDOR_MSM=y
		CONFIG_MSM_EMAC=y
		# CONFIG_MSM_RMNET is not set
		# CONFIG_NET_VENDOR_NATSEMI is not set
		# CONFIG_NET_VENDOR_STMICRO is not set
		@@ -247,8 +247,8 @@ CONFIG_CRYPTO_MD4=y
		CONFIG_CRYPTO_SHA256=y
		CONFIG_CRYPTO_ARC4=y
		CONFIG_CRYPTO_TWOFISH=y
		CONFIG_CRYPTO_DEV_QCRYPTO=m
		CONFIG_CRYPTO_DEV_QCE=m
		CONFIG_CRYPTO_DEV_QCEDEV=m
		CONFIG_CRYPTO_DEV_QCRYPTO=y
		CONFIG_CRYPTO_DEV_QCE=y
		CONFIG_CRYPTO_DEV_OTA_CRYPTO=m
		CONFIG_CRC_CCITT=y
		CONFIG_LIBCRC32C=y