Merge remote-tracking branch 'arm-soc/for-next'

[karo-tx-linux.git] / drivers / tty / n_tracesink.c

diff --git a/drivers/tty/n_tracesink.c b/drivers/tty/n_tracesink.c
index ddce58b973d2017c812c78f073af35f660e42d76..4616870a6b1b96c4755c8fffee9e9a7256590ff2 100644 (file)
--- a/drivers/tty/n_tracesink.c
+++ b/drivers/tty/n_tracesink.c
@@ -34,7 +34,7 @@
 #include <linux/tty_ldisc.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <asm-generic/bug.h>
+#include <linux/bug.h>
 #include "n_tracesink.h"
 
 /*