diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-08-10 15:11:54 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-08-10 15:11:54 +0300 |
| commit | a2071cd765637002523798358d2ca441306d708b (patch) | |
| tree | bafac1682bfa91457439cad09d2eeea71f2ad3bf /include/linux/kernel.h | |
| parent | 784bdf3bb694b256fcd6120b93e8947a84249a3a (diff) | |
| parent | a0cba2179ea4c1820fce2ee046b6ed90ecc56196 (diff) | |
| download | linux-a2071cd765637002523798358d2ca441306d708b.tar.xz | |
Merge branch 'linus' into locking/urgent, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index c42082112ec8..d96a6118d26a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -11,7 +11,6 @@ #include <linux/log2.h> #include <linux/typecheck.h> #include <linux/printk.h> -#include <linux/dynamic_debug.h> #include <asm/byteorder.h> #include <uapi/linux/kernel.h> |