diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-12 09:47:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-12 09:47:47 -0700 |
| commit | 33d444f182a1757640077c6b7381e54c13142b1d (patch) | |
| tree | 106bf7bdd645c2efd645ff3973fcfd64d41cfce8 /drivers | |
| parent | ae7d5c8622a518601a21f14de5c70de5f1c967bf (diff) | |
| parent | 8354c5b72636e5321e9b16dae1da1445506f6af6 (diff) | |
| download | op-kernel-dev-33d444f182a1757640077c6b7381e54c13142b1d.zip op-kernel-dev-33d444f182a1757640077c6b7381e54c13142b1d.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Wire up signalfd/timerfd/eventfd syscalls.
[SPARC64]: Add support for bq4802 TOD chip, as found on ultra45.
[SPARC64]: Correct FIRE_IOMMU_FLUSHINV register offset.
[SPARC64]: envctrl.c needs asm/io.h
[SPARC64]: Update defconfig.
[TTY]: Export proc_clear_tty() to modulea.
[SPARC64]: pci_resource_adjust() cannot be __init.
[SPARC64]: Spelling fixes.
[SPARC]: Spelling fixes.
[SPARC64]: Kill LARGE_ALLOCS and update defconfig.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/tty_io.c | 1 | ||||
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index fe62c21..bc84995 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -3880,6 +3880,7 @@ void proc_clear_tty(struct task_struct *p) p->signal->tty = NULL; spin_unlock_irq(&p->sighand->siglock); } +EXPORT_SYMBOL(proc_clear_tty); static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty) { diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index f2be2ea..8328aca 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c @@ -30,6 +30,7 @@ #include <asm/ebus.h> #include <asm/uaccess.h> #include <asm/envctrl.h> +#include <asm/io.h> #define ENVCTRL_MINOR 162 |
