OpenVZ Forum


Home » Mailing lists » Devel » [PATCH][IRDA] Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS
[PATCH][IRDA] Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS [message #24392] Tue, 04 December 2007 15:14 Go to next message
Pavel Emelianov is currently offline  Pavel Emelianov
Messages: 1149
Registered: September 2006
Senior Member
The function in question is called only from ircomm_tty_read_proc,
which is under this option. Move this helper to the same place.

Fits both net-2.6 and net-2.6.25

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---

diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index 1120b15..be627e1 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -1245,6 +1245,7 @@ static void ircomm_tty_flow_indication(void *instance, void *sap,
 	self->flow = cmd;
 }
 
+#ifdef CONFIG_PROC_FS
 static int ircomm_tty_line_info(struct ircomm_tty_cb *self, char *buf)
 {
 	int  ret=0;
@@ -1354,7 +1355,6 @@ static int ircomm_tty_line_info(struct ircomm_tty_cb *self, char *buf)
  *
  *
  */
-#ifdef CONFIG_PROC_FS
 static int ircomm_tty_read_proc(char *buf, char **start, off_t offset, int len,
 				int *eof, void *unused)
 {
-- 
1.5.3.4
Re: [PATCH][IRDA] Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS [message #24463 is a reply to message #24392] Wed, 05 December 2007 10:19 Go to previous message
davem is currently offline  davem
Messages: 463
Registered: February 2006
Senior Member
From: Pavel Emelyanov <xemul@openvz.org>
Date: Tue, 04 Dec 2007 18:14:48 +0300

> The function in question is called only from ircomm_tty_read_proc,
> which is under this option. Move this helper to the same place.
> 
> Fits both net-2.6 and net-2.6.25
> 
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

Also applied to net-2.6, thanks!
Previous Topic: [PATCH][ROSE] Trivial compilation CONFIG_INET=n case
Next Topic: namespace acceptance process. bad news
Goto Forum:
  


Current Time: Mon May 20 07:04:08 GMT 2024

Total time taken to generate the page: 0.01316 seconds