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:
Sjur Braendeland 2010-06-26 11:31:28 +00:00 committed by David S. Miller
parent cfc9b16b75
commit 01eebb53a6
4 changed files with 7 additions and 29 deletions

View file

@ -2,16 +2,13 @@
# CAIF physical drivers # CAIF physical drivers
# #
if CAIF
comment "CAIF transport drivers" comment "CAIF transport drivers"
config CAIF_TTY config CAIF_TTY
tristate "CAIF TTY transport driver" tristate "CAIF TTY transport driver"
depends on CAIF
default n default n
---help--- ---help---
The CAIF TTY transport driver is a Line Discipline (ldisc) The CAIF TTY transport driver is a Line Discipline (ldisc)
identified as N_CAIF. When this ldisc is opened from user space identified as N_CAIF. When this ldisc is opened from user space
it will redirect the TTY's traffic into the CAIF stack. it will redirect the TTY's traffic into the CAIF stack.
endif # CAIF

View file

@ -1,12 +1,6 @@
ifeq ($(CONFIG_CAIF_DEBUG),1) ifeq ($(CONFIG_CAIF_DEBUG),y)
CAIF_DBG_FLAGS := -DDEBUG EXTRA_CFLAGS += -DDEBUG
endif 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 # Serial interface
obj-$(CONFIG_CAIF_TTY) += caif_serial.o obj-$(CONFIG_CAIF_TTY) += caif_serial.o

View file

@ -21,19 +21,18 @@ menuconfig CAIF
See Documentation/networking/caif for a further explanation on how to See Documentation/networking/caif for a further explanation on how to
use and configure CAIF. use and configure CAIF.
if CAIF
config CAIF_DEBUG config CAIF_DEBUG
bool "Enable Debug" bool "Enable Debug"
depends on CAIF
default n default n
--- help --- --- help ---
Enable the inclusion of debug code in the CAIF stack. Enable the inclusion of debug code in the CAIF stack.
Be aware that doing this will impact performance. Be aware that doing this will impact performance.
If unsure say N. If unsure say N.
config CAIF_NETDEV config CAIF_NETDEV
tristate "CAIF GPRS Network device" tristate "CAIF GPRS Network device"
depends on CAIF
default CAIF default CAIF
---help--- ---help---
Say Y if you will be using a CAIF based GPRS network device. 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 If you select to build it as a built-in then the main CAIF device must
also be a built-in. also be a built-in.
If unsure say Y. If unsure say Y.
endif

View file

@ -1,23 +1,13 @@
ifeq ($(CONFIG_CAIF_DEBUG),1) ifeq ($(CONFIG_CAIF_DEBUG),y)
CAIF_DBG_FLAGS := -DDEBUG EXTRA_CFLAGS += -DDEBUG
endif endif
ccflags-y := $(CAIF_FLAGS) $(CAIF_DBG_FLAGS)
caif-objs := caif_dev.o \ caif-objs := caif_dev.o \
cfcnfg.o cfmuxl.o cfctrl.o \ cfcnfg.o cfmuxl.o cfctrl.o \
cffrml.o cfveil.o cfdbgl.o\ cffrml.o cfveil.o cfdbgl.o\
cfserl.o cfdgml.o \ cfserl.o cfdgml.o \
cfrfml.o cfvidl.o cfutill.o \ cfrfml.o cfvidl.o cfutill.o \
cfsrvl.o cfpkt_skbuff.o caif_config_util.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) += caif.o
obj-$(CONFIG_CAIF_NETDEV) += chnl_net.o obj-$(CONFIG_CAIF_NETDEV) += chnl_net.o