projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug-fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
kernel
/
irq
/
dummychip.c
diff --git
a/kernel/irq/dummychip.c
b/kernel/irq/dummychip.c
index
20dc547
..
b5fcd96
100644
(file)
--- a/
kernel/irq/dummychip.c
+++ b/
kernel/irq/dummychip.c
@@
-31,13
+31,6
@@
static unsigned int noop_ret(struct irq_data *data)
return 0;
}
return 0;
}
-#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
-static void compat_noop(unsigned int irq) { }
-#define END_INIT .end = compat_noop
-#else
-#define END_INIT
-#endif
-
/*
* Generic no controller implementation
*/
/*
* Generic no controller implementation
*/
@@
-48,7
+41,6
@@
struct irq_chip no_irq_chip = {
.irq_enable = noop,
.irq_disable = noop,
.irq_ack = ack_bad,
.irq_enable = noop,
.irq_disable = noop,
.irq_ack = ack_bad,
- END_INIT
};
/*
};
/*
@@
-64,5
+56,4
@@
struct irq_chip dummy_irq_chip = {
.irq_ack = noop,
.irq_mask = noop,
.irq_unmask = noop,
.irq_ack = noop,
.irq_mask = noop,
.irq_unmask = noop,
- END_INIT
};
};