Merge branch 'upstream-merged'

1 files changed, 25 insertions, 0 deletions

diff --git a/libdde_linux26/contrib/include/linux/phonedev.h b/libdde_linux26/contrib/include/linux/phonedev.h
new file mode 100644
index 00000000..4269de99
--- /dev/null
+++ b/libdde_linux26/contrib/include/linux/phonedev.h
@@ -0,0 +1,25 @@
+#ifndef __LINUX_PHONEDEV_H
+#define __LINUX_PHONEDEV_H
+
+#include <linux/types.h>
+
+#ifdef __KERNEL__
+
+#include <linux/poll.h>
+
+struct phone_device {
+	struct phone_device *next;
+	const struct file_operations *f_op;
+	int (*open) (struct phone_device *, struct file *);
+	int board;		/* Device private index */
+	int minor;
+};
+
+extern int phonedev_init(void);
+#define PHONE_MAJOR	100
+extern int phone_register_device(struct phone_device *, int unit);
+#define PHONE_UNIT_ANY	-1
+extern void phone_unregister_device(struct phone_device *);
+
+#endif
+#endif