diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-06-15 09:51:27 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 03:41:18 -0700 |
commit | c23c5c1663b36c1428df32d1645232662459e02f (patch) | |
tree | 99a1497e3599cffd5945936f3552a4e0cb8b73dc /drivers/net/octeon | |
parent | hamachi/yellowfin: Move the packet engine drivers (diff) | |
download | linux-dev-c23c5c1663b36c1428df32d1645232662459e02f.tar.xz linux-dev-c23c5c1663b36c1428df32d1645232662459e02f.zip |
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>
Diffstat (limited to '')
-rw-r--r-- | drivers/net/ethernet/octeon/Kconfig (renamed from drivers/net/octeon/Kconfig) | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/octeon/octeon_mgmt.c (renamed from drivers/net/octeon/octeon_mgmt.c) | 0 | ||||
-rw-r--r-- | drivers/net/octeon/Makefile | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/octeon/Kconfig b/drivers/net/ethernet/octeon/Kconfig index 1e56bbf3f5c0..3de52ffd2872 100644 --- a/drivers/net/octeon/Kconfig +++ b/drivers/net/ethernet/octeon/Kconfig @@ -1,10 +1,14 @@ +# +# Cavium network device configuration +# + config OCTEON_MGMT_ETHERNET tristate "Octeon Management port ethernet driver (CN5XXX, CN6XXX)" depends on CPU_CAVIUM_OCTEON select PHYLIB select MDIO_OCTEON default y - help + ---help--- This option enables the ethernet driver for the management port on Cavium Networks' Octeon CN57XX, CN56XX, CN55XX, CN54XX, CN52XX, and CN6XXX chips. diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c index 429e08c84e9b..429e08c84e9b 100644 --- a/drivers/net/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c diff --git a/drivers/net/octeon/Makefile b/drivers/net/octeon/Makefile deleted file mode 100644 index 906edecacfd3..000000000000 --- a/drivers/net/octeon/Makefile +++ /dev/null @@ -1,2 +0,0 @@ - -obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon_mgmt.o |