projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[powerpc.git]
/
include
/
asm-sparc
/
bug.h
diff --git
a/include/asm-sparc/bug.h
b/include/asm-sparc/bug.h
index
0d30a67
..
0415120
100644
(file)
--- a/
include/asm-sparc/bug.h
+++ b/
include/asm-sparc/bug.h
@@
-1,6
+1,7
@@
#ifndef _SPARC_BUG_H
#define _SPARC_BUG_H
+#ifdef CONFIG_BUG
/* Only use the inline asm until a gcc release that can handle __builtin_trap
* -rob 2003-06-25
*
@@
-26,6
+27,8
@@
extern void do_BUG(const char *file, int line);
#endif
#define HAVE_ARCH_BUG
+#endif
+
#include <asm-generic/bug.h>
#endif