leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octeon: Move the Cavium driver

Browse Source 
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>
This commit is contained in:
Jeff Kirsher 2011-06-15 09:51:27 -07:00
parent 554f4ffd3b
commit c23c5c1663
8 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/Kconfig
View File

@ -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
# #

1
drivers/net/Makefile
View File

@ -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/

1
drivers/net/ethernet/Kconfig
View File

@ -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"

1
drivers/net/ethernet/Makefile
View File

@ -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/

6
drivers/net/octeon/Kconfig → drivers/net/ethernet/octeon/Kconfig
View File

@ -1,10 +1,14 @@
#
# 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.

5
drivers/net/ethernet/octeon/Makefile Normal file
View File

@ -0,0 +1,5 @@
#
# Makefile for the Cavium network device drivers.
#
obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon_mgmt.o

0
drivers/net/octeon/octeon_mgmt.c → drivers/net/ethernet/octeon/octeon_mgmt.c
View File

2
drivers/net/octeon/Makefile
View File

@ -1,2 +0,0 @@
obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon_mgmt.o