git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[safe/jmp/linux-2.6]
/
include
/
linux
/
lockdep.h
diff --git
a/include/linux/lockdep.h
b/include/linux/lockdep.h
index
37a0361
..
23bf02f
100644
(file)
--- a/
include/linux/lockdep.h
+++ b/
include/linux/lockdep.h
@@
-390,7
+390,7
@@
do { \
#endif /* CONFIG_LOCK_STAT */
-#if
defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS)
+#if
def CONFIG_GENERIC_HARDIRQS
extern void early_init_irq_lock_class(void);
#else
static inline void early_init_irq_lock_class(void)