diff options
| author | Justin Waters <justin.waters@timesys.com> | 2008-02-26 13:07:02 -0500 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2008-02-26 13:07:02 -0500 |
| commit | b80a32b9cc634adfa8eaef33ec981e7febf2ade2 (patch) | |
| tree | f256bce13ba11f514a388160df84e1410bedbe2b /arch/um/include/chan_user.h | |
| parent | 594133ef22fae0d737bd1b57352cf3f48a192c63 (diff) | |
Update the i.MX31 Kernel to 2.6.232.6.23-mx31ads-2008022618072.6.23-mx31-200802261807
This is the result of a brute-force attempt to update the kernel to 2.6.23.
Now that we have a git tree, our effort will be a little nicer in the future.
Signed-off-by: Justin Waters <justin.waters@timesys.com>
Diffstat (limited to 'arch/um/include/chan_user.h')
| -rw-r--r-- | arch/um/include/chan_user.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/um/include/chan_user.h b/arch/um/include/chan_user.h index 38f16d812e7c..5a2263e05bb2 100644 --- a/arch/um/include/chan_user.h +++ b/arch/um/include/chan_user.h @@ -12,8 +12,6 @@ struct chan_opts { void (*const announce)(char *dev_name, int dev); char *xterm_title; const int raw; - const unsigned long tramp_stack; - const int in_kernel; }; enum chan_init_pri { INIT_STATIC, INIT_ALL, INIT_ONE }; @@ -44,7 +42,8 @@ extern void generic_free(void *data); struct tty_struct; extern void register_winch(int fd, struct tty_struct *tty); -extern void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty); +extern void register_winch_irq(int fd, int tty_fd, int pid, + struct tty_struct *tty, unsigned long stack); #define __channel_help(fn, prefix) \ __uml_help(fn, prefix "[0-9]*=<channel description>\n" \ |