From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 3 Feb 2013 14:08:46 +0000 (+0100)
Subject: compat: adapt signature change of tty_flip_buffer_push() and tty_insert_flip_string()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=364ab9517a19d1da97d7acdc39d3019f468fdfc6;p=openwrt%2Fstaging%2Fblogic.git

compat: adapt signature change of tty_flip_buffer_push() and tty_insert_flip_string()

The method signature of tty_flip_buffer_push() and
tty_insert_flip_string() was changed in these commits and this converts
it to the old behavior.

commit 2e124b4a390ca85325fae75764bef92f0547fa25
Author: Jiri Slaby <jslaby@suse.cz>
Date:   Thu Jan 3 15:53:06 2013 +0100

    TTY: switch tty_flip_buffer_push

commit 05c7cd39907184328f48d3e7899f9cdd653ad336
Author: Jiri Slaby <jslaby@suse.cz>
Date:   Thu Jan 3 15:53:04 2013 +0100

    TTY: switch tty_insert_flip_string

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/include/linux/compat-3.7.h b/include/linux/compat-3.7.h
index 6b1d2cfad3b7..03c5ce4d33c6 100644
--- a/include/linux/compat-3.7.h
+++ b/include/linux/compat-3.7.h
@@ -13,6 +13,7 @@
 #include <linux/user_namespace.h>
 #include <linux/file.h>
 #include <linux/seq_file.h>
+#include <linux/tty_flip.h>
 #include <net/netlink.h>
 
 #define VM_DONTDUMP    VM_NODUMP
@@ -197,6 +198,9 @@ static inline s64 nla_get_s64(struct nlattr *nla)
 	return tmp;
 }
 
+#define tty_flip_buffer_push(port) tty_flip_buffer_push((port)->tty)
+#define tty_insert_flip_string(port, chars, size) tty_insert_flip_string((port)->tty, chars, size)
+
 #else /* (LINUX_VERSION_CODE > KERNEL_VERSION(3,7,0)) */
 #define netlink_notify_portid(__notify) (__notify->portid)
 #define genl_info_snd_portid(__genl_info) (__genl_info->snd_portid)