summaryrefslogtreecommitdiff
path: root/net/Makefile
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2014-04-07 23:49:35 (GMT)
committerScott Wood <scottwood@freescale.com>2014-04-07 23:49:35 (GMT)
commit62b8c978ee6b8d135d9e7953221de58000dba986 (patch)
tree683b04b2e627f6710c22c151b23c8cc9a165315e /net/Makefile
parent78fd82238d0e5716578c326404184a27ba67fd6e (diff)
downloadlinux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'net/Makefile')
-rw-r--r--net/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/Makefile b/net/Makefile
index 8fa2f91..9492e8c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -71,4 +71,3 @@ obj-$(CONFIG_NFC) += nfc/
obj-$(CONFIG_OPENVSWITCH) += openvswitch/
obj-$(CONFIG_VSOCKETS) += vmw_vsock/
obj-$(CONFIG_NET_MPLS_GSO) += mpls/
-obj-$(CONFIG_HSR) += hsr/