projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-v850
/
bug.h
diff --git
a/include/asm-v850/bug.h
b/include/asm-v850/bug.h
index c778916bf7f2c1410c02387e5b27a3d81f24333f..b0ed2d35f3e830293f56de96d1fd8a82e5ea0f95 100644
(file)
--- a/
include/asm-v850/bug.h
+++ b/
include/asm-v850/bug.h
@@
-14,9
+14,12
@@
#ifndef __V850_BUG_H__
#define __V850_BUG_H__
+#ifdef CONFIG_BUG
extern void __bug (void) __attribute__ ((noreturn));
#define BUG() __bug()
#define HAVE_ARCH_BUG
+#endif
+
#include <asm-generic/bug.h>
#endif /* __V850_BUG_H__ */