summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/sis/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-11-29 13:51:07 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-11-29 13:51:07 +0400
commit0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 (patch)
treed2ca69347816c27f9dc352581f5d0fe76811cd49 /drivers/net/ethernet/sis/Makefile
parent3d95fd6ad8d3cf582a70ed65660017114b6e4065 (diff)
parentcaca6a03d365883564885f2c1da3e88dcf65d139 (diff)
downloadlinux-0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4.tar.xz
Merge commit 'v3.2-rc3' into next
Diffstat (limited to 'drivers/net/ethernet/sis/Makefile')
-rw-r--r--drivers/net/ethernet/sis/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sis/Makefile b/drivers/net/ethernet/sis/Makefile
new file mode 100644
index 000000000000..58d3ac1985df
--- /dev/null
+++ b/drivers/net/ethernet/sis/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for Silicon Integrated Systems (SiS) network device drivers.
+#
+
+obj-$(CONFIG_SIS190) += sis190.o
+obj-$(CONFIG_SIS900) += sis900.o