diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-27 02:48:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-27 02:48:40 -0500 |
| commit | 5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch) | |
| tree | 22d29905c148d2d743b3eccb585fbe60fb91e25a /drivers/net/Makefile | |
| parent | 851fd7bd88524bb4e20f3def3127cd9167d6d0cf (diff) | |
| parent | 3ec192559033ed457f0d7856838654c100fc659f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/hp-plus.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/recv.c
net/wireless/reg.c
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index e06829aa75b0..5f3baca3620d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -113,7 +113,7 @@ obj-$(CONFIG_EL2) += 3c503.o 8390p.o | |||
| 113 | obj-$(CONFIG_NE2000) += ne.o 8390p.o | 113 | obj-$(CONFIG_NE2000) += ne.o 8390p.o |
| 114 | obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o | 114 | obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o |
| 115 | obj-$(CONFIG_HPLAN) += hp.o 8390p.o | 115 | obj-$(CONFIG_HPLAN) += hp.o 8390p.o |
| 116 | obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390.o | 116 | obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o |
| 117 | obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o | 117 | obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o |
| 118 | obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o | 118 | obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o |
| 119 | obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o | 119 | obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o |