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/pch_gbe/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/pch_gbe/Makefile')
-rw-r--r-- | drivers/net/pch_gbe/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/pch_gbe/Makefile b/drivers/net/pch_gbe/Makefile new file mode 100644 index 000000000000..31288d4ad248 --- /dev/null +++ b/drivers/net/pch_gbe/Makefile | |||
@@ -0,0 +1,4 @@ | |||
1 | obj-$(CONFIG_PCH_GBE) += pch_gbe.o | ||
2 | |||
3 | pch_gbe-y := pch_gbe_phy.o pch_gbe_ethtool.o pch_gbe_param.o | ||
4 | pch_gbe-y += pch_gbe_api.o pch_gbe_main.o | ||