diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-15 20:35:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-15 20:35:57 -0400 |
| commit | d0174640eedc1cd756754f03afe2dbb3d56de74e (patch) | |
| tree | 57d9911c28da12b05bc78a2f53dab349479fe37b /drivers/net/Makefile | |
| parent | bb8bd3a52a5dbca8bea31bfc72dacfb384170e69 (diff) | |
| parent | fadacb1b80e35e0b36a90d43e21ef91eec4b889b (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
drivers/net/pcmcia/3c589_cs: fix port configuration switcheroo
sk98lin: resurrect driver
ucc_geth: fix compilation
mv643xx_eth: Fix tx_bytes stats calculation
As struct iw_point is bi-directional payload, we should copy back the content
[PATCH] bcm43xx: Fix cancellation of work queue crashes
spidernet: fix interrupt reason recognition
ehea: fix last_rx update
ehea: propagate physical port state
Fix a lock problem in generic phy code
sky2: restore multicast list on resume and other ops
atl1: disable broken 64-bit DMA
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 e684212fd8e2..9c928a845841 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -66,6 +66,7 @@ ps3_gelic-objs += ps3_gelic_net.o | |||
| 66 | obj-$(CONFIG_TC35815) += tc35815.o | 66 | obj-$(CONFIG_TC35815) += tc35815.o |
| 67 | obj-$(CONFIG_SKGE) += skge.o | 67 | obj-$(CONFIG_SKGE) += skge.o |
| 68 | obj-$(CONFIG_SKY2) += sky2.o | 68 | obj-$(CONFIG_SKY2) += sky2.o |
| 69 | obj-$(CONFIG_SK98LIN) += sk98lin/ | ||
| 69 | obj-$(CONFIG_SKFP) += skfp/ | 70 | obj-$(CONFIG_SKFP) += skfp/ |
| 70 | obj-$(CONFIG_VIA_RHINE) += via-rhine.o | 71 | obj-$(CONFIG_VIA_RHINE) += via-rhine.o |
| 71 | obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o | 72 | obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o |