projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linville-20131001' of git://github.com/kvalo/ath
[cascardo/linux.git]
/
kernel
/
softirq.c
diff --git
a/kernel/softirq.c
b/kernel/softirq.c
index
be3d351
..
53cc09c
100644
(file)
--- a/
kernel/softirq.c
+++ b/
kernel/softirq.c
@@
-876,7
+876,6
@@
int __init __weak early_irq_init(void)
return 0;
}
-#ifdef CONFIG_GENERIC_HARDIRQS
int __init __weak arch_probe_nr_irqs(void)
{
return NR_IRQS_LEGACY;
@@
-886,4
+885,3
@@
int __init __weak arch_early_irq_init(void)
{
return 0;
}
-#endif