summaryrefslogtreecommitdiffstats
path: root/drivers/net/Makefile
diff options
context:
space:
mode:
authorOskar Schirmer <os@emlix.com>2009-06-10 12:58:48 -0700
committerChris Zankel <chris@zankel.net>2009-06-22 02:37:34 -0700
commit8b0215aa5b01eb3cb54ca57bfa36e94a0d039ed9 (patch)
treeb77e9c17da9c2ddd82dcad55bc777daf75d92174 /drivers/net/Makefile
parent0b3eb21b2f2222c4c1e3e21fc3cd427404d3991a (diff)
downloadlinux-8b0215aa5b01eb3cb54ca57bfa36e94a0d039ed9.tar.bz2
s6gmac: xtensa s6000 on-chip ethernet driver
The s6000 on-chip MAC supports 10/100/1000Mbit and is connected to an external PHY via MII or RGMII interface. [jw@emlix.com: don't use device->bus_id directly] Signed-off-by: Oskar Schirmer <os@emlix.com> Signed-off-by: Daniel Glockner <dg@emlix.com> Acked-by: "David S. Miller" <davem@davemloft.net> Signed-off-by: Johannes Weiner <jw@emlix.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r--drivers/net/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index d366fb2b40e9..4b58a59f211b 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -245,6 +245,7 @@ obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
obj-$(CONFIG_DNET) += dnet.o
obj-$(CONFIG_MACB) += macb.o
+obj-$(CONFIG_S6GMAC) += s6gmac.o
obj-$(CONFIG_ARM) += arm/
obj-$(CONFIG_DEV_APPLETALK) += appletalk/