diff options
| author | Sjur Braendeland <sjur.brandeland@stericsson.com> | 2010-06-26 11:31:28 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-29 00:06:38 -0700 |
| commit | 01eebb53a65996dfbfb892bf5eb21ae831fbe3a6 (patch) | |
| tree | 958201b54f52778159010d55006c52d00955d654 | |
| parent | cfc9b16b75f2cef1e0b283fd2b52ddde568401ab (diff) | |
| download | kernel_goldelico_gta04-01eebb53a65996dfbfb892bf5eb21ae831fbe3a6.zip kernel_goldelico_gta04-01eebb53a65996dfbfb892bf5eb21ae831fbe3a6.tar.gz kernel_goldelico_gta04-01eebb53a65996dfbfb892bf5eb21ae831fbe3a6.tar.bz2 | |
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>
| -rw-r--r-- | drivers/net/caif/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/net/caif/Makefile | 10 | ||||
| -rw-r--r-- | net/caif/Kconfig | 7 | ||||
| -rw-r--r-- | net/caif/Makefile | 14 |
4 files changed, 7 insertions, 29 deletions
diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig index 0b28e01..6f33ee4 100644 --- a/drivers/net/caif/Kconfig +++ b/drivers/net/caif/Kconfig @@ -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 diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile index 52b6d1f..e6d3ca0 100644 --- a/drivers/net/caif/Makefile +++ b/drivers/net/caif/Makefile @@ -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 diff --git a/net/caif/Kconfig b/net/caif/Kconfig index ed65178..529750d 100644 --- a/net/caif/Kconfig +++ b/net/caif/Kconfig @@ -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 diff --git a/net/caif/Makefile b/net/caif/Makefile index 34852af..f87481f 100644 --- a/net/caif/Makefile +++ b/net/caif/Makefile @@ -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 |