diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-01 09:56:10 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-01 09:56:26 +0200 |
| commit | 087021ba41e9481202103d51d3dd0c4706899a2b (patch) | |
| tree | bf5d67420fd176682a1f8f1e9342ad397c23937a /drivers/net/Makefile | |
| parent | fb9c818873a788c5c01c9868cc6050df96e2c7df (diff) | |
| parent | e83c2b0ff325f52dda1aff3572d0e1516216c54b (diff) | |
| download | op-kernel-dev-087021ba41e9481202103d51d3dd0c4706899a2b.zip op-kernel-dev-087021ba41e9481202103d51d3dd0c4706899a2b.tar.gz | |
Merge branch 'linus' into perfcounters/urgent
Merge reason: this branch was on a .30-ish base before, update
it to an almost-.31-rc2 upstream base to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 d366fb2..4b58a59 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/ |
