diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/net/Makefile | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 e5c34b464211..a3c5c002f224 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -263,3 +263,4 @@ obj-$(CONFIG_NIU) += niu.o | |||
| 263 | obj-$(CONFIG_VIRTIO_NET) += virtio_net.o | 263 | obj-$(CONFIG_VIRTIO_NET) += virtio_net.o |
| 264 | obj-$(CONFIG_SFC) += sfc/ | 264 | obj-$(CONFIG_SFC) += sfc/ |
| 265 | 265 | ||
| 266 | obj-$(CONFIG_WIMAX) += wimax/ | ||