diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 17:24:43 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 17:24:43 +0300 |
| commit | 2c2e5bb97544198a62e4edbf6aca5dd201979564 (patch) | |
| tree | ffb927ea311d86aeee3a0ef561d6218280c038cb /include/linux/dynamic_debug.h | |
| parent | 9b6872a123862cecd19a958f08eb9848b6a4240d (diff) | |
| parent | 6311d329e12a358a9813d2e929d26fbc5a4c73c2 (diff) | |
| download | linux-2c2e5bb97544198a62e4edbf6aca5dd201979564.tar.xz | |
Merge branch 'for-5.1/hid-asus' into for-linus
Asus Transbook T100CHI and T90CHI support from NOGUCHI Hiroshi
Diffstat (limited to 'include/linux/dynamic_debug.h')
| -rw-r--r-- | include/linux/dynamic_debug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 2fd8006153c3..b3419da1a776 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -2,7 +2,7 @@ #ifndef _DYNAMIC_DEBUG_H #define _DYNAMIC_DEBUG_H -#if defined(CC_HAVE_ASM_GOTO) && defined(CONFIG_JUMP_LABEL) +#if defined(CONFIG_JUMP_LABEL) #include <linux/jump_label.h> #endif @@ -38,7 +38,7 @@ struct _ddebug { #define _DPRINTK_FLAGS_DEFAULT 0 #endif unsigned int flags:8; -#ifdef HAVE_JUMP_LABEL +#ifdef CONFIG_JUMP_LABEL union { struct static_key_true dd_key_true; struct static_key_false dd_key_false; @@ -83,7 +83,7 @@ void __dynamic_netdev_dbg(struct _ddebug *descriptor, dd_key_init(key, init) \ } -#ifdef HAVE_JUMP_LABEL +#ifdef CONFIG_JUMP_LABEL #define dd_key_init(key, init) key = (init) |