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

Commit 40a5a443 authored Apr 18, 2010 by Michael Neuling Committed by Benjamin Herrenschmidt May 21, 2010

powerpc: Build-in e1000e for pseries & ppc64_defconfig



The e1000e device is becoming more common these days, so let's just
build it in for pseries & ppc64_defconfig.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent 32c96f77

arch/powerpc/configs/ppc64_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -988,7 +988,7 @@ CONFIG_ACENIC=m
	CONFIG_ACENIC_OMIT_TIGON_I=y		CONFIG_ACENIC_OMIT_TIGON_I=y
	# CONFIG_DL2K is not set		# CONFIG_DL2K is not set
	CONFIG_E1000=y		CONFIG_E1000=y
	CONFIG_E1000E=m		CONFIG_E1000E=y
	# CONFIG_IP1000 is not set		# CONFIG_IP1000 is not set
	# CONFIG_IGB is not set		# CONFIG_IGB is not set
	# CONFIG_NS83820 is not set		# CONFIG_NS83820 is not set

arch/powerpc/configs/pseries_defconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -804,7 +804,7 @@ CONFIG_ACENIC=m
	CONFIG_ACENIC_OMIT_TIGON_I=y		CONFIG_ACENIC_OMIT_TIGON_I=y
	# CONFIG_DL2K is not set		# CONFIG_DL2K is not set
	CONFIG_E1000=y		CONFIG_E1000=y
	CONFIG_E1000E=m		CONFIG_E1000E=y
	# CONFIG_IP1000 is not set		# CONFIG_IP1000 is not set
	# CONFIG_IGB is not set		# CONFIG_IGB is not set
	# CONFIG_NS83820 is not set		# CONFIG_NS83820 is not set