summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-06-17 21:45:53 -0700
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-12 12:37:45 -0700
commit19c72cacce0ed8def4a37a5b4c4408cc83cf949c (patch)
tree91c87ef23a6d8f3555db3a58023c6e8cff84e71e /drivers/net
parent7443713a31f284365454493a9adbaea02bcc4344 (diff)
korina: Move the IDT driver
Move the IDT driver into drivers/net/ethernet/ and make the necessary Kconfig and Makefile changes CC: "IDT Inc." <rischelp@idt.com> CC: Felix Fietkau <nbd@openwrt.org> CC: Florian Fainelli <florian@openwrt.org> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/Kconfig7
-rw-r--r--drivers/net/Makefile1
-rw-r--r--drivers/net/ethernet/Kconfig7
-rw-r--r--drivers/net/ethernet/Makefile1
-rw-r--r--drivers/net/ethernet/korina.c (renamed from drivers/net/korina.c)0
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index bcf7368decd9..d9b3cb5aad33 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -237,13 +237,6 @@ config MACB
source "drivers/net/arm/Kconfig"
-config KORINA
- tristate "Korina (IDT RC32434) Ethernet support"
- depends on NET_ETHERNET && MIKROTIK_RB532
- help
- If you have a Mikrotik RouterBoard 500 or IDT RC32434
- based system say Y. Otherwise say N.
-
config MIPS_SIM_NET
tristate "MIPS simulator Network device"
depends on MIPS_SIM
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 2fb039b963fb..6c17cb6c35a7 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -54,7 +54,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_MACVTAP) += macvtap.o
obj-$(CONFIG_DEFXX) += defxx.o
obj-$(CONFIG_EQUALIZER) += eql.o
-obj-$(CONFIG_KORINA) += korina.o
obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 72d0f5ef23c7..dae10a3eca78 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -45,6 +45,13 @@ config JME
To compile this driver as a module, choose M here. The module
will be called jme.
+config KORINA
+ tristate "Korina (IDT RC32434) Ethernet support"
+ depends on MIKROTIK_RB532
+ ---help---
+ If you have a Mikrotik RouterBoard 500 or IDT RC32434
+ based system say Y. Otherwise say N.
+
source "drivers/net/ethernet/marvell/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
source "drivers/net/ethernet/micrel/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index a8d8913b3055..ddf097df9238 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/
obj-$(CONFIG_IP1000) += icplus/
obj-$(CONFIG_JME) += jme.o
+obj-$(CONFIG_KORINA) += korina.o
obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
diff --git a/drivers/net/korina.c b/drivers/net/ethernet/korina.c
index 763844c587fd..763844c587fd 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/ethernet/korina.c