diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-27 12:14:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-27 12:14:34 -0400 |
| commit | 95148229d32e5c68445a59d981482dba57f91919 (patch) | |
| tree | 5bbc1e38abd7db893036d2659788453edffc6dac /drivers/net/tokenring/Makefile | |
| parent | efe3d3c8ee6805c7e8b17f9aae554c04b271ab99 (diff) | |
| parent | 88f07484ccdf08e58dc462ed1ac7eb2e84d88a17 (diff) | |
| download | linux-95148229d32e5c68445a59d981482dba57f91919.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize
Diffstat (limited to 'drivers/net/tokenring/Makefile')
| -rw-r--r-- | drivers/net/tokenring/Makefile | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/tokenring/Makefile b/drivers/net/tokenring/Makefile index c88b0a5e5380..f1be8d97b7a8 100644 --- a/drivers/net/tokenring/Makefile +++ b/drivers/net/tokenring/Makefile @@ -2,14 +2,15 @@ # Makefile for drivers/net/tokenring # -obj-$(CONFIG_IBMTR) += ibmtr.o -obj-$(CONFIG_IBMOL) += olympic.o -obj-$(CONFIG_IBMLS) += lanstreamer.o -obj-$(CONFIG_TMS380TR) += tms380tr.o -obj-$(CONFIG_ABYSS) += abyss.o -obj-$(CONFIG_MADGEMC) += madgemc.o -obj-$(CONFIG_PROTEON) += proteon.o -obj-$(CONFIG_TMSPCI) += tmspci.o -obj-$(CONFIG_SKISA) += skisa.o -obj-$(CONFIG_SMCTR) += smctr.o +obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o +obj-$(CONFIG_IBMTR) += ibmtr.o +obj-$(CONFIG_IBMOL) += olympic.o +obj-$(CONFIG_IBMLS) += lanstreamer.o +obj-$(CONFIG_TMS380TR) += tms380tr.o +obj-$(CONFIG_ABYSS) += abyss.o +obj-$(CONFIG_MADGEMC) += madgemc.o +obj-$(CONFIG_PROTEON) += proteon.o +obj-$(CONFIG_TMSPCI) += tmspci.o +obj-$(CONFIG_SKISA) += skisa.o +obj-$(CONFIG_SMCTR) += smctr.o obj-$(CONFIG_3C359) += 3c359.o |