diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /arch/um/include/asm/hw_irq.h | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/um/include/asm/hw_irq.h')
| -rw-r--r-- | arch/um/include/asm/hw_irq.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/um/include/asm/hw_irq.h b/arch/um/include/asm/hw_irq.h deleted file mode 100644 index 1cf84cf5f21a..000000000000 --- a/arch/um/include/asm/hw_irq.h +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | #ifndef _ASM_UM_HW_IRQ_H | ||
| 2 | #define _ASM_UM_HW_IRQ_H | ||
| 3 | |||
| 4 | #include "asm/irq.h" | ||
| 5 | #include "asm/archparam.h" | ||
| 6 | |||
| 7 | #endif | ||