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/kernel/irq.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
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 9e485c770308..71b8c947e5ef 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
| @@ -258,6 +258,7 @@ void deactivate_fd(int fd, int irqnum) | |||
| 258 | 258 | ||
| 259 | ignore_sigio_fd(fd); | 259 | ignore_sigio_fd(fd); |
| 260 | } | 260 | } |
| 261 | EXPORT_SYMBOL(deactivate_fd); | ||
| 261 | 262 | ||
| 262 | /* | 263 | /* |
| 263 | * Called just before shutdown in order to provide a clean exec | 264 | * Called just before shutdown in order to provide a clean exec |