diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/net/sfc/Makefile | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/net/sfc/Makefile')
| -rw-r--r-- | drivers/net/sfc/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile index 0f023447eafd..1d2daeec7ac1 100644 --- a/drivers/net/sfc/Makefile +++ b/drivers/net/sfc/Makefile | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | sfc-y += efx.o falcon.o tx.o rx.o falcon_xmac.o \ | 1 | sfc-y += efx.o falcon.o tx.o rx.o falcon_xmac.o \ |
| 2 | i2c-direct.o ethtool.o xfp_phy.o mdio_10g.o \ | 2 | i2c-direct.o selftest.o ethtool.o xfp_phy.o \ |
| 3 | tenxpress.o boards.o sfe4001.o | 3 | mdio_10g.o tenxpress.o boards.o sfe4001.o |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_SFC) += sfc.o | 5 | obj-$(CONFIG_SFC) += sfc.o |