diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-01-29 16:11:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-29 16:11:26 -0500 |
| commit | 30088a25e9c4dc1f8bd5c48b14a18633441b5481 (patch) | |
| tree | 522124a1ec4b39d18f3af6c8f3a169f59aee9de9 /drivers/net/ethernet/sfc/Makefile | |
| parent | ipv6: Eliminate dst_get_neighbour_noref() usage in ip6_forward(). (diff) | |
| parent | sfc: Replace efx_rx_buffer::is_page and other booleans with a flags field (diff) | |
| download | linux-dev-30088a25e9c4dc1f8bd5c48b14a18633441b5481.tar.xz linux-dev-30088a25e9c4dc1f8bd5c48b14a18633441b5481.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Diffstat (limited to 'drivers/net/ethernet/sfc/Makefile')
| -rw-r--r-- | drivers/net/ethernet/sfc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/Makefile b/drivers/net/ethernet/sfc/Makefile index ab31c7124db1..3fa2e25ccc45 100644 --- a/drivers/net/ethernet/sfc/Makefile +++ b/drivers/net/ethernet/sfc/Makefile @@ -2,7 +2,7 @@ sfc-y += efx.o nic.o falcon.o siena.o tx.o rx.o filter.o \ falcon_xmac.o mcdi_mac.o \ selftest.o ethtool.o qt202x_phy.o mdio_10g.o \ tenxpress.o txc43128_phy.o falcon_boards.o \ - mcdi.o mcdi_phy.o + mcdi.o mcdi_phy.o mcdi_mon.o sfc-$(CONFIG_SFC_MTD) += mtd.o obj-$(CONFIG_SFC) += sfc.o |