diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/um/kernel/irq.c | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/um/kernel/irq.c')
| -rw-r--r-- | arch/um/kernel/irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index 89474ba0741e..a3f0b04d7101 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include "linux/module.h" | 12 | #include "linux/module.h" |
| 13 | #include "linux/sched.h" | 13 | #include "linux/sched.h" |
| 14 | #include "linux/seq_file.h" | 14 | #include "linux/seq_file.h" |
| 15 | #include "linux/slab.h" | ||
| 15 | #include "as-layout.h" | 16 | #include "as-layout.h" |
| 16 | #include "kern_util.h" | 17 | #include "kern_util.h" |
| 17 | #include "os.h" | 18 | #include "os.h" |