diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-22 18:22:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-22 18:22:42 -0700 |
| commit | 76fef2b6bffa13ad7ccd54c0493b053295721b9a (patch) | |
| tree | f4509477d413398b7155fb3c35453ab26bd81bce /drivers/net/tulip/Makefile | |
| parent | 817bc4db7794d6dc6594265ddea88d2b839cf2f8 (diff) | |
| parent | ef8500457b29eed13d03ff19af36d810308e57b7 (diff) | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Conflicts:
drivers/s390/net/qeth_main.c
Diffstat (limited to 'drivers/net/tulip/Makefile')
| -rw-r--r-- | drivers/net/tulip/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tulip/Makefile b/drivers/net/tulip/Makefile index 451090d6fcc..200cbf7c815 100644 --- a/drivers/net/tulip/Makefile +++ b/drivers/net/tulip/Makefile @@ -2,7 +2,6 @@ # Makefile for the Linux "Tulip" family network device drivers. # -obj-$(CONFIG_PCMCIA_XIRTULIP) += xircom_tulip_cb.o obj-$(CONFIG_PCMCIA_XIRCOM) += xircom_cb.o obj-$(CONFIG_DM9102) += dmfe.o obj-$(CONFIG_WINBOND_840) += winbond-840.o |