diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/Kconfig | 17 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/microchip/Kconfig | 37 | ||||
| -rw-r--r-- | drivers/net/ethernet/microchip/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/microchip/enc28j60.c (renamed from drivers/net/enc28j60.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/microchip/enc28j60_hw.h (renamed from drivers/net/enc28j60_hw.h) | 0 |
8 files changed, 44 insertions, 18 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 75ca0da52ea2..e83f559a2c46 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -274,23 +274,6 @@ config DM9000_FORCE_SIMPLE_PHY_POLL costly MII PHY reads. Note, this will not work if the chip is operating with an external PHY. -config ENC28J60 - tristate "ENC28J60 support" - depends on EXPERIMENTAL && SPI && NET_ETHERNET - select CRC32 - ---help--- - Support for the Microchip EN28J60 ethernet chip. - - To compile this driver as a module, choose M here. The module will be - called enc28j60. - -config ENC28J60_WRITEVERIFY - bool "Enable write verify" - depends on ENC28J60 - ---help--- - Enable the verify after the buffer write useful for debugging purpose. - If unsure, say N. - config NET_PCI bool "EISA, VLB, PCI and on board controllers" depends on ISA || EISA || PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index e2f1f554dd73..08ee56fc607e 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -53,7 +53,6 @@ obj-$(CONFIG_TUN) += tun.o obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_NET_NETX) += netx-eth.o obj-$(CONFIG_DM9000) += dm9000.o -obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_ETHERNET) += ethernet/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 32561c71040d..0cec25cbf36b 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -78,6 +78,7 @@ config LANTIQ_ETOP source "drivers/net/ethernet/marvell/Kconfig" source "drivers/net/ethernet/mellanox/Kconfig" source "drivers/net/ethernet/micrel/Kconfig" +source "drivers/net/ethernet/microchip/Kconfig" config MIPS_SIM_NET tristate "MIPS simulator Network device" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 94f1be8e822b..ebe8aee3f839 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ +obj-$(CONFIG_NET_VENDOR_MICROCHIP) += microchip/ obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ obj-$(CONFIG_FEALNX) += fealnx.o diff --git a/drivers/net/ethernet/microchip/Kconfig b/drivers/net/ethernet/microchip/Kconfig new file mode 100644 index 000000000000..53b0b04935a3 --- /dev/null +++ b/drivers/net/ethernet/microchip/Kconfig @@ -0,0 +1,37 @@ +# +# Microchip network device configuration +# + +config NET_VENDOR_MICROCHIP + bool "Microchip devices" + depends on SPI && EXPERIMENTAL + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about Microchip cards. If you say Y, you will be asked + for your specific card in the following questions. + +if NET_VENDOR_MICROCHIP + +config ENC28J60 + tristate "ENC28J60 support" + depends on SPI && EXPERIMENTAL + select CRC32 + ---help--- + Support for the Microchip EN28J60 ethernet chip. + + To compile this driver as a module, choose M here. The module will be + called enc28j60. + +config ENC28J60_WRITEVERIFY + bool "Enable write verify" + depends on ENC28J60 + ---help--- + Enable the verify after the buffer write useful for debugging purpose. + If unsure, say N. + +endif # NET_VENDOR_MICROCHIP diff --git a/drivers/net/ethernet/microchip/Makefile b/drivers/net/ethernet/microchip/Makefile new file mode 100644 index 000000000000..573d4292b9ea --- /dev/null +++ b/drivers/net/ethernet/microchip/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Microchip network device drivers. +# + +obj-$(CONFIG_ENC28J60) += enc28j60.o diff --git a/drivers/net/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c index 2837ce209cd7..2837ce209cd7 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/ethernet/microchip/enc28j60.c diff --git a/drivers/net/enc28j60_hw.h b/drivers/net/ethernet/microchip/enc28j60_hw.h index 25b41de49f0e..25b41de49f0e 100644 --- a/drivers/net/enc28j60_hw.h +++ b/drivers/net/ethernet/microchip/enc28j60_hw.h |