summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/Makefile
diff options
context:
space:
mode:
authorJamie Iles <jamie.iles@mathembedded.com>2011-11-08 10:12:32 +0000
committerJamie Iles <jamie@jamieiles.com>2011-11-22 15:21:17 +0000
commitf75ba50bdc2bcfab591bdf903312557033d0ac68 (patch)
tree4ccc618be2fb9f998eed75549ca69b31712b0d0e /drivers/net/ethernet/Makefile
parentc220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff)
downloadblackbird-op-linux-f75ba50bdc2bcfab591bdf903312557033d0ac68.tar.gz
blackbird-op-linux-f75ba50bdc2bcfab591bdf903312557033d0ac68.zip
macb: initial support for Cadence GEM
The Cadence GEM is based on the MACB Ethernet controller but has a few small changes with regards to register and bitfield placement. This patch detects the presence of a GEM by reading the module ID register and setting a flag appropriately. This handles the new HW address, USRIO and hash register base register locations in GEM. v3: - convert to macb_is_gem() inline rather than storing a boolean flag - handle rx_overrun stats for gem Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Jamie Iles <jamie@jamieiles.com> Tested-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'drivers/net/ethernet/Makefile')
-rw-r--r--drivers/net/ethernet/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index be5dde040261..94b7f287d6c5 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/
obj-$(CONFIG_NET_VENDOR_AMD) += amd/
obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
-obj-$(CONFIG_NET_ATMEL) += cadence/
+obj-$(CONFIG_NET_CADENCE) += cadence/
obj-$(CONFIG_NET_BFIN) += adi/
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
OpenPOWER on IntegriCloud