diff options
| author | Oskar Schirmer <os@emlix.com> | 2009-06-10 15:58:48 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-06-22 05:37:34 -0400 |
| commit | 8b0215aa5b01eb3cb54ca57bfa36e94a0d039ed9 (patch) | |
| tree | b77e9c17da9c2ddd82dcad55bc777daf75d92174 /drivers/net/Makefile | |
| parent | 0b3eb21b2f2222c4c1e3e21fc3cd427404d3991a (diff) | |
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/Makefile | 1 |
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 | |||
| 245 | 245 | ||
| 246 | obj-$(CONFIG_DNET) += dnet.o | 246 | obj-$(CONFIG_DNET) += dnet.o |
| 247 | obj-$(CONFIG_MACB) += macb.o | 247 | obj-$(CONFIG_MACB) += macb.o |
| 248 | obj-$(CONFIG_S6GMAC) += s6gmac.o | ||
| 248 | 249 | ||
| 249 | obj-$(CONFIG_ARM) += arm/ | 250 | obj-$(CONFIG_ARM) += arm/ |
| 250 | obj-$(CONFIG_DEV_APPLETALK) += appletalk/ | 251 | obj-$(CONFIG_DEV_APPLETALK) += appletalk/ |