diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /drivers/net/Makefile | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 246323d7f161..ad1346dd9da9 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -285,3 +285,5 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o | |||
| 285 | obj-$(CONFIG_SFC) += sfc/ | 285 | obj-$(CONFIG_SFC) += sfc/ |
| 286 | 286 | ||
| 287 | obj-$(CONFIG_WIMAX) += wimax/ | 287 | obj-$(CONFIG_WIMAX) += wimax/ |
| 288 | |||
| 289 | obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/ | ||