diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 12:11:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 12:11:24 -0700 |
| commit | da8e5aa21e037be02e0752e80b9444ff60185a3f (patch) | |
| tree | f99d040e1f23e2d329488765440c52c89631fc75 /drivers/net/Makefile | |
| parent | a43f007ba19cef4fac953d9e860e8a668e042e2d (diff) | |
| parent | 9030b3dd671d672f5fcc91c2ec48f02082310af4 (diff) | |
| download | linux-da8e5aa21e037be02e0752e80b9444ff60185a3f.tar.bz2 | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (22 commits)
Fix ethernet multicast for ucc_geth.
netdrvr/pcmcia: use IRQ_TYPE_DYNAMIC_SHARING flag for irq.Attributes.
FEC - fast ethernet controller for mpc52xx
ehea: add kexec support
e1000e: Remove legacy jumbo frame receive code
e1000e: Re-enable SECRC - crc stripping
e1000e: Fix PBA calculation for jumbo frame packets
e1000e: Fix jumbo frame receive code.
drivers/net/irda/au1k_ir: fix obvious irq handler bugs
ipg: Kconfig whitepaces/tab damages
ipg: missing Kconfig dependency
r8169: remove poll_locked logic
r8169: napi config
[PATCH] iwl3945: fix direct scan problem
[PATCH] iwl3945: cancel scan on rxon command
[PATCH] iwl4965: fix scan problem
[PATCH] iwl4965: fix driver hang related to hardware scan
[PATCH] iwlwifi: fix sending probe request in iwl 4965
[PATCH] rtl8187: Allow multicast frames
[PATCH] b43/b43legacy: jiffies_round -> jiffies_round_relative
...
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 593262065c9b..0e5fde4a1b2c 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -96,6 +96,10 @@ obj-$(CONFIG_SHAPER) += shaper.o obj-$(CONFIG_HP100) += hp100.o obj-$(CONFIG_SMC9194) += smc9194.o obj-$(CONFIG_FEC) += fec.o +obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o +ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y) + obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o +endif obj-$(CONFIG_68360_ENET) += 68360enet.o obj-$(CONFIG_WD80x3) += wd.o 8390.o obj-$(CONFIG_EL2) += 3c503.o 8390.o |