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 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
s390
/
include
/
asm
/
irq.h
diff --git
a/arch/s390/include/asm/irq.h
b/arch/s390/include/asm/irq.h
index
b0d5f0a
..
343ea7c
100644
(file)
--- a/
arch/s390/include/asm/irq.h
+++ b/
arch/s390/include/asm/irq.h
@@
-1,11
+1,11
@@
#ifndef _ASM_IRQ_H
#define _ASM_IRQ_H
#ifndef _ASM_IRQ_H
#define _ASM_IRQ_H
-#define EXT_INTERRUPT
1
-#define IO_INTERRUPT
2
-#define THIN_INTERRUPT
3
+#define EXT_INTERRUPT
0
+#define IO_INTERRUPT
1
+#define THIN_INTERRUPT
2
-#define NR_IRQS_BASE
4
+#define NR_IRQS_BASE
3
#ifdef CONFIG_PCI_NR_MSI
# define NR_IRQS (NR_IRQS_BASE + CONFIG_PCI_NR_MSI)
#ifdef CONFIG_PCI_NR_MSI
# define NR_IRQS (NR_IRQS_BASE + CONFIG_PCI_NR_MSI)
@@
-13,9
+13,6
@@
# define NR_IRQS NR_IRQS_BASE
#endif
# define NR_IRQS NR_IRQS_BASE
#endif
-/* This number is used when no interrupt has been assigned */
-#define NO_IRQ 0
-
/* External interruption codes */
#define EXT_IRQ_INTERRUPT_KEY 0x0040
#define EXT_IRQ_CLK_COMP 0x1004
/* External interruption codes */
#define EXT_IRQ_INTERRUPT_KEY 0x0040
#define EXT_IRQ_CLK_COMP 0x1004