diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 19:48:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 19:48:20 +0200 |
| commit | 14dc5249728ff699b1ca4dac01ad416a350a147a (patch) | |
| tree | 4ffd91101601f55c5e0b53a00f03534b7e044ac4 /drivers/net/Makefile | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp... (diff) | |
| parent | splice: direct splicing updates ppos twice (diff) | |
| download | linux-14dc5249728ff699b1ca4dac01ad416a350a147a.tar.xz linux-14dc5249728ff699b1ca4dac01ad416a350a147a.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
splice: direct splicing updates ppos twice
more ACSI removal
umem: Fix match of pci_ids in umem driver
umem: Remove references to dead CONFIG_MM_MAP_MEMORY variable
remove the documentation for the legacy CDROM drivers
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index b95b1b237a26..eb4167622a6a 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -181,8 +181,6 @@ obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o obj-$(CONFIG_DECLANCE) += declance.o obj-$(CONFIG_ATARILANCE) += atarilance.o -obj-$(CONFIG_ATARI_BIONET) += atari_bionet.o -obj-$(CONFIG_ATARI_PAMSNET) += atari_pamsnet.o obj-$(CONFIG_A2065) += a2065.o obj-$(CONFIG_HYDRA) += hydra.o obj-$(CONFIG_ARIADNE) += ariadne.o |