projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
tty_ldisc.h
diff --git
a/include/linux/tty_ldisc.h
b/include/linux/tty_ldisc.h
index 6226504d91080bd10b9eb91e7a6adf4cbc3ab579..40f38d896777400f1bcbb56c36063eed22db45fe 100644
(file)
--- a/
include/linux/tty_ldisc.h
+++ b/
include/linux/tty_ldisc.h
@@
-104,7
+104,7
@@
#include <linux/fs.h>
#include <linux/wait.h>
#include <linux/fs.h>
#include <linux/wait.h>
-struct tty_ldisc {
+struct tty_ldisc
_ops
{
int magic;
char *name;
int num;
int magic;
char *name;
int num;
@@
-142,6
+142,11
@@
struct tty_ldisc {
int refcount;
};
int refcount;
};
+struct tty_ldisc {
+ struct tty_ldisc_ops *ops;
+ int refcount;
+};
+
#define TTY_LDISC_MAGIC 0x5403
#define LDISC_FLAG_DEFINED 0x00000001
#define TTY_LDISC_MAGIC 0x5403
#define LDISC_FLAG_DEFINED 0x00000001