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

Commit c23c5c16 authored Jun 15, 2011 by Jeff Kirsher

octeon: Move the Cavium driver



Move the Cavium driver to drivers/net/ethernet/octeon/ and
make the necessary Kconfig and Makefile changes.

CC: David Daney <david.daney@cavium.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: David Daney <david.daney@cavium.com>

parent 554f4ffd

drivers/net/Kconfig

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -506,8 +506,6 @@ config LANTIQ_ETOP
	help		help
	Support for the MII0 inside the Lantiq SoC		Support for the MII0 inside the Lantiq SoC

	source "drivers/net/octeon/Kconfig"

	endif # NET_ETHERNET		endif # NET_ETHERNET

	#		#

drivers/net/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -105,5 +105,4 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
	obj-$(CONFIG_WIMAX) += wimax/		obj-$(CONFIG_WIMAX) += wimax/
	obj-$(CONFIG_CAIF) += caif/		obj-$(CONFIG_CAIF) += caif/

	obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
	obj-$(CONFIG_TILE_NET) += tile/		obj-$(CONFIG_TILE_NET) += tile/

drivers/net/ethernet/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@ source "drivers/net/ethernet/myricom/Kconfig"
	source "drivers/net/ethernet/natsemi/Kconfig"		source "drivers/net/ethernet/natsemi/Kconfig"
	source "drivers/net/ethernet/8390/Kconfig"		source "drivers/net/ethernet/8390/Kconfig"
	source "drivers/net/ethernet/nuvoton/Kconfig"		source "drivers/net/ethernet/nuvoton/Kconfig"
			source "drivers/net/ethernet/octeon/Kconfig"
	source "drivers/net/ethernet/oki-semi/Kconfig"		source "drivers/net/ethernet/oki-semi/Kconfig"
	source "drivers/net/ethernet/packetengines/Kconfig"		source "drivers/net/ethernet/packetengines/Kconfig"
	source "drivers/net/ethernet/pasemi/Kconfig"		source "drivers/net/ethernet/pasemi/Kconfig"

drivers/net/ethernet/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
	obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/		obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
	obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/		obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
	obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/		obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/
			obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
	obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/		obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/
	obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/		obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
	obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/		obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/

drivers/net/octeon/Kconfig→drivers/net/ethernet/octeon/Kconfig

+5 −1

Original line number	Original line	Diff line number	Diff line
			#
			# Cavium network device configuration
			#

	config OCTEON_MGMT_ETHERNET		config OCTEON_MGMT_ETHERNET
	tristate "Octeon Management port ethernet driver (CN5XXX, CN6XXX)"		tristate "Octeon Management port ethernet driver (CN5XXX, CN6XXX)"
	depends on CPU_CAVIUM_OCTEON		depends on CPU_CAVIUM_OCTEON
	select PHYLIB		select PHYLIB
	select MDIO_OCTEON		select MDIO_OCTEON
	default y		default y
	help		---help---
	This option enables the ethernet driver for the management		This option enables the ethernet driver for the management
	port on Cavium Networks' Octeon CN57XX, CN56XX, CN55XX,		port on Cavium Networks' Octeon CN57XX, CN56XX, CN55XX,
	CN54XX, CN52XX, and CN6XXX chips.		CN54XX, CN52XX, and CN6XXX chips.