summaryrefslogtreecommitdiff
path: root/drivers/net/wimax/Makefile
diff options
context:
space:
mode:
authorChris Zankel <chris@zankel.net>2014-10-21 08:26:01 +0400
committerChris Zankel <chris@zankel.net>2014-10-21 08:26:01 +0400
commita13926db3e5ea5bbac297f59e9f35061f52892d3 (patch)
treeb794f25550b7dbbe9cc8eda81633df9023b4821c /drivers/net/wimax/Makefile
parentf2589bff1ce8b94cebc044e5dfeac4d4e8701cbc (diff)
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
downloadlinux-a13926db3e5ea5bbac297f59e9f35061f52892d3.tar.xz
Merge tag 'v3.18-rc1' into for_next
Linux 3.18-rc1
Diffstat (limited to 'drivers/net/wimax/Makefile')
-rw-r--r--drivers/net/wimax/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wimax/Makefile b/drivers/net/wimax/Makefile
index 992bc02bc016..692184dd674a 100644
--- a/drivers/net/wimax/Makefile
+++ b/drivers/net/wimax/Makefile
@@ -1,5 +1 @@
-
obj-$(CONFIG_WIMAX_I2400M) += i2400m/
-
-# (from Sam Ravnborg) force kbuild to create built-in.o
-obj- := dummy.o