diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-28 23:39:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-28 23:39:05 -0500 |
| commit | b656cc64cf815d8ff6e99883a531fafc48199bd0 (patch) | |
| tree | a5d29b7163327e406233598b843adc2e4edbbc52 /arch/s390 | |
| parent | 74abc20cedf6f95a0065665c55180ef2d4828ba5 (diff) | |
| parent | 8b7ac017aa0f9b803e9da9caafa5fe9544ecf5c7 (diff) | |
| download | op-kernel-dev-b656cc64cf815d8ff6e99883a531fafc48199bd0.zip op-kernel-dev-b656cc64cf815d8ff6e99883a531fafc48199bd0.tar.gz | |
Merge branch 's390-next'
Ursula Braun says:
====================
s390: network patches for net-next
here are some s390 related patches for net-next
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index f238720..0220e7d 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c @@ -79,7 +79,6 @@ static const struct irq_class irqclass_sub_desc[NR_ARCH_IRQS] = { {.irq = IRQIO_TAP, .name = "TAP", .desc = "[I/O] Tape"}, {.irq = IRQIO_VMR, .name = "VMR", .desc = "[I/O] Unit Record Devices"}, {.irq = IRQIO_LCS, .name = "LCS", .desc = "[I/O] LCS"}, - {.irq = IRQIO_CLW, .name = "CLW", .desc = "[I/O] CLAW"}, {.irq = IRQIO_CTC, .name = "CTC", .desc = "[I/O] CTC"}, {.irq = IRQIO_APB, .name = "APB", .desc = "[I/O] AP Bus"}, {.irq = IRQIO_ADM, .name = "ADM", .desc = "[I/O] EADM Subchannel"}, |
