diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /drivers/net/Makefile | |
| parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
| parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
Merge branch 'upstream-fixes'
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 39b17cb4f86e..4c9477cb2127 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -28,6 +28,7 @@ obj-$(CONFIG_SUNQE) += sunqe.o | |||
| 28 | obj-$(CONFIG_SUNBMAC) += sunbmac.o | 28 | obj-$(CONFIG_SUNBMAC) += sunbmac.o |
| 29 | obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o | 29 | obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o |
| 30 | obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o | 30 | obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o |
| 31 | obj-$(CONFIG_CASSINI) += cassini.o | ||
| 31 | 32 | ||
| 32 | obj-$(CONFIG_MACE) += mace.o | 33 | obj-$(CONFIG_MACE) += mace.o |
| 33 | obj-$(CONFIG_BMAC) += bmac.o | 34 | obj-$(CONFIG_BMAC) += bmac.o |