diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 22:03:51 -0400 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /drivers/net/Makefile | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
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 4b58a59f211b..ead8cab3cfe1 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -88,6 +88,7 @@ obj-$(CONFIG_SKGE) += skge.o | |||
| 88 | obj-$(CONFIG_SKY2) += sky2.o | 88 | obj-$(CONFIG_SKY2) += sky2.o |
| 89 | obj-$(CONFIG_SKFP) += skfp/ | 89 | obj-$(CONFIG_SKFP) += skfp/ |
| 90 | obj-$(CONFIG_KS8842) += ks8842.o | 90 | obj-$(CONFIG_KS8842) += ks8842.o |
| 91 | obj-$(CONFIG_KS8851) += ks8851.o | ||
| 91 | obj-$(CONFIG_VIA_RHINE) += via-rhine.o | 92 | obj-$(CONFIG_VIA_RHINE) += via-rhine.o |
| 92 | obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o | 93 | obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o |
| 93 | obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o | 94 | obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o |