summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 21:18:00 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 21:18:00 +0400
commit95948c31bec26e631ecf138cb04dcd547519c7af (patch)
tree10a56e8c9635131bcbef28721443b63b39642840 /net
parent45acab01ca6389371ec39e16844768a60f5f1380 (diff)
parent69dbb2f79a5626741a24770719406a4edb2cb84f (diff)
downloadlinux-95948c31bec26e631ecf138cb04dcd547519c7af.tar.xz
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] mm: add ZONE_DMA to 31-bit config again [S390] mm: add page fault retry handling [S390] mm: handle kernel caused page fault oom situations [S390] delay: implement ndelay [S390] topology,sched: fix cpu_coregroup_mask/cpu_book_mask definitions [S390] hwsampler: allow cpu hotplug [S390] uaccess: turn __access_ok() into a define [S390] irq: merge irq.c and s390_ext.c [S390] irq: fix service signal external interrupt handling [S390] pfault: always enable service signal interrupt
Diffstat (limited to 'net')
-rw-r--r--net/iucv/iucv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index a15c01524959..7f9124914b13 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -54,7 +54,7 @@
#include <asm/atomic.h>
#include <asm/ebcdic.h>
#include <asm/io.h>
-#include <asm/s390_ext.h>
+#include <asm/irq.h>
#include <asm/smp.h>
/*