diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 16:16:56 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 16:16:56 (GMT) |
commit | 5a439c565799cb8d290d71ce375e86be64d43a4b (patch) | |
tree | b7933dced01add02249af35f5497e77cd11dbfdf /drivers/net/Makefile | |
parent | 94b6da5ab8293b04a300ba35c72eddfa94db8b02 (diff) | |
parent | 0025427eee4b5c005b4ac7a6489adc773e38611d (diff) | |
download | linux-fsl-qoriq-5a439c565799cb8d290d71ce375e86be64d43a4b.tar.xz |
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: Add config files for Diamond 232L - Rev B processor variant
xtensa: Fix io regions
xtensa: Add support for the Sonic Ethernet device for the XT2000 board.
xtensa: replace remaining __FUNCTION__ occurrences
xtensa: use newer __SPIN_LOCK_UNLOCKED macro
XTENSA: warn about including <asm/rwsem.h> directly.
Diffstat (limited to 'drivers/net/Makefile')
-rw-r--r-- | drivers/net/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index fa2510b..f19acf8 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -227,6 +227,8 @@ pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o obj-$(CONFIG_MLX4_CORE) += mlx4/ obj-$(CONFIG_ENC28J60) += enc28j60.o +obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o + obj-$(CONFIG_MACB) += macb.o obj-$(CONFIG_ARM) += arm/ |