diff options
| author | matt mooney <mfmooney@gmail.com> | 2011-05-11 01:54:13 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-11 14:06:51 -0700 |
| commit | 981f30cc9b93fbf1f722f31276ddb19b95a30ddd (patch) | |
| tree | 6695074aa98b1d4f88c426329d6f455ce2c9f7b8 | |
| parent | 0c4ac072b3f5e1287a11f109ca0cc9c909d74919 (diff) | |
| download | op-kernel-dev-981f30cc9b93fbf1f722f31276ddb19b95a30ddd.zip op-kernel-dev-981f30cc9b93fbf1f722f31276ddb19b95a30ddd.tar.gz | |
staging: usbip: change debug configuration option
Change CONFIG_USB_IP_DEBUG_ENABLE to CONFIG_USB_IP_DEBUG, and move
ccflags- to the head of the makefile.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/usbip/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/staging/usbip/Makefile | 5 | ||||
| -rw-r--r-- | drivers/staging/usbip/usbip_common.c | 2 | ||||
| -rw-r--r-- | drivers/staging/usbip/usbip_common.h | 8 |
4 files changed, 9 insertions, 10 deletions
diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig index 2c1d10a..466f0d3c 100644 --- a/drivers/staging/usbip/Kconfig +++ b/drivers/staging/usbip/Kconfig @@ -35,8 +35,8 @@ config USB_IP_HOST To compile this driver as a module, choose M here: the module will be called usbip. -config USB_IP_DEBUG_ENABLE - bool "USB-IP Debug Enable" +config USB_IP_DEBUG + bool "USB/IP debug messages" depends on USB_IP_COMMON default N ---help--- diff --git a/drivers/staging/usbip/Makefile b/drivers/staging/usbip/Makefile index 279f3cc..a43a890 100644 --- a/drivers/staging/usbip/Makefile +++ b/drivers/staging/usbip/Makefile @@ -1,3 +1,5 @@ +ccflags-$(CONFIG_USB_IP_DEBUG) := -DDEBUG + obj-$(CONFIG_USB_IP_COMMON) += usbip_common_mod.o usbip_common_mod-y := usbip_common.o usbip_event.o @@ -6,6 +8,3 @@ vhci-hcd-y := vhci_sysfs.o vhci_tx.o vhci_rx.o vhci_hcd.o obj-$(CONFIG_USB_IP_HOST) += usbip.o usbip-y := stub_dev.o stub_main.o stub_rx.o stub_tx.o - -ccflags-$(CONFIG_USB_IP_DEBUG_ENABLE) := -DDEBUG - diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c index b46e9b5..279cad4 100644 --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c @@ -30,7 +30,7 @@ #define DRIVER_AUTHOR "Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>" #define DRIVER_DESC "USB/IP Common Driver" -#ifdef CONFIG_USB_IP_DEBUG_ENABLE +#ifdef CONFIG_USB_IP_DEBUG unsigned long usbip_debug_flag = 0xffffffff; #else unsigned long usbip_debug_flag; diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h index 0b61d71..c84bed9 100644 --- a/drivers/staging/usbip/usbip_common.h +++ b/drivers/staging/usbip/usbip_common.h @@ -27,11 +27,11 @@ #include <net/sock.h> /** - * usbip_udbg - print debug messages if CONFIG_USB_IP_DEBUG_ENABLE is defined + * usbip_udbg - print debug messages if CONFIG_USB_IP_DEBUG is defined * @fmt: * @args: */ -#ifdef CONFIG_USB_IP_DEBUG_ENABLE +#ifdef CONFIG_USB_IP_DEBUG #define usbip_udbg(fmt, args...) \ do { \ @@ -40,11 +40,11 @@ __FILE__, __LINE__, __func__, ##args); \ } while (0) -#else /* CONFIG_USB_IP_DEBUG_ENABLE */ +#else #define usbip_udbg(fmt, args...) do { } while (0) -#endif /* CONFIG_USB_IP_DEBUG_ENABLE */ +#endif /* CONFIG_USB_IP_DEBUG */ enum { usbip_debug_xmit = (1 << 0), |
