diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 14:25:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 14:25:16 -0400 |
| commit | 62d3af1b5f3aa613e0a489e8d798d45b07f373f4 (patch) | |
| tree | 8f10dfd23c18600392965b69f94dd389e60827d5 /drivers/net/Makefile | |
| parent | 942b6f62164cf8822dd03b1569777f4663d1abd7 (diff) | |
| parent | e71180f3689e00c5a1095925352a72dacdd62e34 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 1a84e0435f64..7c313cb341b8 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -203,3 +203,6 @@ obj-$(CONFIG_IRDA) += irda/ | |||
| 203 | obj-$(CONFIG_ETRAX_ETHERNET) += cris/ | 203 | obj-$(CONFIG_ETRAX_ETHERNET) += cris/ |
| 204 | 204 | ||
| 205 | obj-$(CONFIG_NETCONSOLE) += netconsole.o | 205 | obj-$(CONFIG_NETCONSOLE) += netconsole.o |
| 206 | |||
| 207 | obj-$(CONFIG_FS_ENET) += fs_enet/ | ||
| 208 | |||