aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-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
237 237
238source "drivers/net/arm/Kconfig" 238source "drivers/net/arm/Kconfig"
239 239
240config KORINA
241 tristate "Korina (IDT RC32434) Ethernet support"
242 depends on NET_ETHERNET && MIKROTIK_RB532
243 help
244 If you have a Mikrotik RouterBoard 500 or IDT RC32434
245 based system say Y. Otherwise say N.
246
247config MIPS_SIM_NET 240config MIPS_SIM_NET
248 tristate "MIPS simulator Network device" 241 tristate "MIPS simulator Network device"
249 depends on MIPS_SIM 242 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
54obj-$(CONFIG_MACVTAP) += macvtap.o 54obj-$(CONFIG_MACVTAP) += macvtap.o
55obj-$(CONFIG_DEFXX) += defxx.o 55obj-$(CONFIG_DEFXX) += defxx.o
56obj-$(CONFIG_EQUALIZER) += eql.o 56obj-$(CONFIG_EQUALIZER) += eql.o
57obj-$(CONFIG_KORINA) += korina.o
58obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o 57obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
59obj-$(CONFIG_TUN) += tun.o 58obj-$(CONFIG_TUN) += tun.o
60obj-$(CONFIG_VETH) += veth.o 59obj-$(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
45 To compile this driver as a module, choose M here. The module 45 To compile this driver as a module, choose M here. The module
46 will be called jme. 46 will be called jme.
47 47
48config KORINA
49 tristate "Korina (IDT RC32434) Ethernet support"
50 depends on MIKROTIK_RB532
51 ---help---
52 If you have a Mikrotik RouterBoard 500 or IDT RC32434
53 based system say Y. Otherwise say N.
54
48source "drivers/net/ethernet/marvell/Kconfig" 55source "drivers/net/ethernet/marvell/Kconfig"
49source "drivers/net/ethernet/mellanox/Kconfig" 56source "drivers/net/ethernet/mellanox/Kconfig"
50source "drivers/net/ethernet/micrel/Kconfig" 57source "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/
25obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/ 25obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/
26obj-$(CONFIG_IP1000) += icplus/ 26obj-$(CONFIG_IP1000) += icplus/
27obj-$(CONFIG_JME) += jme.o 27obj-$(CONFIG_JME) += jme.o
28obj-$(CONFIG_KORINA) += korina.o
28obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ 29obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
29obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ 30obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
30obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ 31obj-$(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