Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[mirror_ubuntu-artful-kernel.git] / net / caif / Makefile

diff --git a/net/caif/Makefile b/net/caif/Makefile
index 34852af2595e24befcfdf78e2e6ec674874bbd37..9d38e406e4a4937bf84ffba58e053bfb704ef51e 100644 (file)
--- a/net/caif/Makefile
+++ b/net/caif/Makefile
@@ -1,26 +1,14 @@
-ifeq ($(CONFIG_CAIF_DEBUG),1)
-CAIF_DBG_FLAGS := -DDEBUG
-endif
+ccflags-$(CONFIG_CAIF_DEBUG)     :=      -DDEBUG
 
-ccflags-y := $(CAIF_FLAGS) $(CAIF_DBG_FLAGS)
-
-caif-objs := caif_dev.o \
+caif-y := caif_dev.o \
        cfcnfg.o cfmuxl.o cfctrl.o  \
        cffrml.o cfveil.o cfdbgl.o\
        cfserl.o cfdgml.o  \
        cfrfml.o cfvidl.o cfutill.o \
        cfsrvl.o cfpkt_skbuff.o caif_config_util.o
-clean-dirs:= .tmp_versions
-
-clean-files:= \
-       Module.symvers \
-       modules.order \
-       *.cmd \
-       *.o \
-       *~
 
 obj-$(CONFIG_CAIF) += caif.o
 obj-$(CONFIG_CAIF_NETDEV) += chnl_net.o
 obj-$(CONFIG_CAIF) += caif_socket.o
 
-export-objs := caif.o
+export-y := caif.o