diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-27 12:32:29 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-27 12:32:29 +0000 |
| commit | b99053eefce89c5c8500517f5f065c85b57d98ee (patch) | |
| tree | 2e99059d55e32db39a2ada348c39f71bb473c0c1 /arch/um/include/shared/ubd_user.h | |
| parent | 761e0ee0f0beecee7c2528588b043609b880de58 (diff) | |
| parent | f8d56f1771e4867acc461146764b4feeb5245669 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/um/include/shared/ubd_user.h')
| -rw-r--r-- | arch/um/include/shared/ubd_user.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/um/include/shared/ubd_user.h b/arch/um/include/shared/ubd_user.h new file mode 100644 index 00000000000..bb66517f073 --- /dev/null +++ b/arch/um/include/shared/ubd_user.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2000 Jeff Dike (jdike@karaya.com) + * Copyright (C) 2001 RidgeRun, Inc (glonnon@ridgerun.com) + * Licensed under the GPL + */ + +#ifndef __UM_UBD_USER_H +#define __UM_UBD_USER_H + +extern void ignore_sigwinch_sig(void); +extern int start_io_thread(unsigned long sp, int *fds_out); +extern int io_thread(void *arg); +extern int kernel_fd; + +#endif + +/* + * Overrides for Emacs so that we follow Linus's tabbing style. + * Emacs will notice this stuff at the end of the file and automatically + * adjust the settings for this buffer only. This must remain at the end + * of the file. + * --------------------------------------------------------------------------- + * Local variables: + * c-file-style: "linux" + * End: + */ |