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

Commit b4ea75b6 authored Jan 18, 2006 by Jeff Garzik

Merge branch 'upstream-fixes'

parents 2baeaaa4 7c4d3367

arch/arm/configs/ep80219_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -522,6 +522,7 @@ CONFIG_E100=y
		# CONFIG_DL2K is not set
		CONFIG_E1000=y
		CONFIG_E1000_NAPI=y
		# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
		# CONFIG_NS83820 is not set
		# CONFIG_HAMACHI is not set
		# CONFIG_YELLOWFIN is not set

arch/arm/configs/iq31244_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -493,6 +493,7 @@ CONFIG_NETDEVICES=y
		# CONFIG_DL2K is not set
		CONFIG_E1000=y
		CONFIG_E1000_NAPI=y
		# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
		# CONFIG_NS83820 is not set
		# CONFIG_HAMACHI is not set
		# CONFIG_YELLOWFIN is not set

arch/arm/configs/iq80321_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -415,6 +415,7 @@ CONFIG_NETDEVICES=y
		# CONFIG_DL2K is not set
		CONFIG_E1000=y
		CONFIG_E1000_NAPI=y
		# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
		# CONFIG_NS83820 is not set
		# CONFIG_HAMACHI is not set
		# CONFIG_YELLOWFIN is not set

arch/arm/configs/iq80331_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -496,6 +496,7 @@ CONFIG_NETDEVICES=y
		# CONFIG_DL2K is not set
		CONFIG_E1000=y
		CONFIG_E1000_NAPI=y
		# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
		# CONFIG_NS83820 is not set
		# CONFIG_HAMACHI is not set
		# CONFIG_YELLOWFIN is not set

arch/arm/configs/iq80332_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -496,6 +496,7 @@ CONFIG_NETDEVICES=y
		# CONFIG_DL2K is not set
		CONFIG_E1000=y
		CONFIG_E1000_NAPI=y
		# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
		# CONFIG_NS83820 is not set
		# CONFIG_HAMACHI is not set
		# CONFIG_YELLOWFIN is not set