caif: Kconfig and Makefile fixes
Use "depends on" instead of "if" in Kconfig files. Fixed CAIF debug flag, and removed unnecessary clean-* options. Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
cfc9b16b75
commit
01eebb53a6
|
@ -2,16 +2,13 @@
|
|||
# CAIF physical drivers
|
||||
#
|
||||
|
||||
if CAIF
|
||||
|
||||
comment "CAIF transport drivers"
|
||||
|
||||
config CAIF_TTY
|
||||
tristate "CAIF TTY transport driver"
|
||||
depends on CAIF
|
||||
default n
|
||||
---help---
|
||||
The CAIF TTY transport driver is a Line Discipline (ldisc)
|
||||
identified as N_CAIF. When this ldisc is opened from user space
|
||||
it will redirect the TTY's traffic into the CAIF stack.
|
||||
|
||||
endif # CAIF
|
||||
|
|
|
@ -1,12 +1,6 @@
|
|||
ifeq ($(CONFIG_CAIF_DEBUG),1)
|
||||
CAIF_DBG_FLAGS := -DDEBUG
|
||||
ifeq ($(CONFIG_CAIF_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
|
||||
KBUILD_EXTRA_SYMBOLS=net/caif/Module.symvers
|
||||
|
||||
ccflags-y := $(CAIF_FLAGS) $(CAIF_DBG_FLAGS)
|
||||
clean-dirs:= .tmp_versions
|
||||
clean-files:= Module.symvers modules.order *.cmd *~ \
|
||||
|
||||
# Serial interface
|
||||
obj-$(CONFIG_CAIF_TTY) += caif_serial.o
|
||||
|
|
|
@ -21,19 +21,18 @@ menuconfig CAIF
|
|||
See Documentation/networking/caif for a further explanation on how to
|
||||
use and configure CAIF.
|
||||
|
||||
if CAIF
|
||||
|
||||
config CAIF_DEBUG
|
||||
bool "Enable Debug"
|
||||
depends on CAIF
|
||||
default n
|
||||
--- help ---
|
||||
Enable the inclusion of debug code in the CAIF stack.
|
||||
Be aware that doing this will impact performance.
|
||||
If unsure say N.
|
||||
|
||||
|
||||
config CAIF_NETDEV
|
||||
tristate "CAIF GPRS Network device"
|
||||
depends on CAIF
|
||||
default CAIF
|
||||
---help---
|
||||
Say Y if you will be using a CAIF based GPRS network device.
|
||||
|
@ -41,5 +40,3 @@ config CAIF_NETDEV
|
|||
If you select to build it as a built-in then the main CAIF device must
|
||||
also be a built-in.
|
||||
If unsure say Y.
|
||||
|
||||
endif
|
||||
|
|
|
@ -1,23 +1,13 @@
|
|||
ifeq ($(CONFIG_CAIF_DEBUG),1)
|
||||
CAIF_DBG_FLAGS := -DDEBUG
|
||||
ifeq ($(CONFIG_CAIF_DEBUG),y)
|
||||
EXTRA_CFLAGS += -DDEBUG
|
||||
endif
|
||||
|
||||
ccflags-y := $(CAIF_FLAGS) $(CAIF_DBG_FLAGS)
|
||||
|
||||
caif-objs := 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
|
||||
|
|
Loading…
Reference in New Issue