diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2011-05-26 03:48:24 -0400 |
|---|---|---|
| committer | Heiko Carstens <heiko.carstens@de.ibm.com> | 2011-05-26 03:48:24 -0400 |
| commit | d7b250e2a2d7f3cd23cf8d8d6689285e6f51a98d (patch) | |
| tree | 5bfb94fff047818db31613762a8986784241ca8c /arch/s390/kernel/time.c | |
| parent | df7997ab1ca82ae3c37a2f5eb98613fc24527f95 (diff) | |
[S390] irq: merge irq.c and s390_ext.c
Merge irq.c and s390_ext.c into irq.c. That way all external interrupt
related functions are together.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/time.c')
| -rw-r--r-- | arch/s390/kernel/time.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index a59557f1fb5f..dff933065ab6 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <linux/kprobes.h> | 41 | #include <linux/kprobes.h> |
| 42 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
| 43 | #include <asm/delay.h> | 43 | #include <asm/delay.h> |
| 44 | #include <asm/s390_ext.h> | ||
| 45 | #include <asm/div64.h> | 44 | #include <asm/div64.h> |
| 46 | #include <asm/vdso.h> | 45 | #include <asm/vdso.h> |
| 47 | #include <asm/irq.h> | 46 | #include <asm/irq.h> |