diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/tulip/Makefile | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/tulip/Makefile')
| -rw-r--r-- | drivers/net/tulip/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/tulip/Makefile b/drivers/net/tulip/Makefile index 200cbf7c815c..5e8be38b45bb 100644 --- a/drivers/net/tulip/Makefile +++ b/drivers/net/tulip/Makefile | |||
| @@ -2,6 +2,8 @@ | |||
| 2 | # Makefile for the Linux "Tulip" family network device drivers. | 2 | # Makefile for the Linux "Tulip" family network device drivers. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | ccflags-$(CONFIG_NET_TULIP) := -DDEBUG | ||
| 6 | |||
| 5 | obj-$(CONFIG_PCMCIA_XIRCOM) += xircom_cb.o | 7 | obj-$(CONFIG_PCMCIA_XIRCOM) += xircom_cb.o |
| 6 | obj-$(CONFIG_DM9102) += dmfe.o | 8 | obj-$(CONFIG_DM9102) += dmfe.o |
| 7 | obj-$(CONFIG_WINBOND_840) += winbond-840.o | 9 | obj-$(CONFIG_WINBOND_840) += winbond-840.o |