Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[karo-tx-linux.git] / net / can / Makefile

diff --git a/net/can/Makefile b/net/can/Makefile
index cef49eb1f5c7bc37908c1f7b3432740f1b4c2377..10936754e3f272766cd3b699ee3acc8f58e89bfc 100644 (file)
--- a/net/can/Makefile
+++ b/net/can/Makefile
@@ -3,7 +3,8 @@
 #
 
 obj-$(CONFIG_CAN)      += can.o
-can-y                  := af_can.o proc.o
+can-y                  := af_can.o
+can-$(CONFIG_PROC_FS)  += proc.o
 
 obj-$(CONFIG_CAN_RAW)  += can-raw.o
 can-raw-y              := raw.o