diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 12:38:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-22 12:38:31 -0700 |
| commit | f39cf0b783b3f402ddf1eb6a09234b5bfe34bb2a (patch) | |
| tree | 6ac105287f433be5be65b14f1246a23e368c3ae2 /drivers/net/Makefile | |
| parent | 59ef7a83f1127038a433464597df02e2dc9540e7 (diff) | |
| parent | aafd1255d08fb26cab87d1b28ff35a15bdb2ed68 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: enable m41t80 driver in s6105_defconfig
xtensa: add m41t62 rtc to s6105 platform
xtensa: enable s6gmac in s6105_defconfig
xtensa: s6105 specific configuration for s6gmac
s6gmac: xtensa s6000 on-chip ethernet driver
xtensa: support s6000 gpio irqs and alternate function selection
xtensa: s6000 dma engine support
xtensa: allow variant to initialize own irq chips
xtensa: cache inquiry and unaligned cache handling functions
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 d366fb2b40e..4b58a59f211 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/ |