diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /arch/um/kernel/irq.c | |
| parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
| parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) | |
Merge branch 'hid-suspend' into picolcd
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" |