* [PATCH][IRDA] Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS
@ 2007-12-04 15:14 Pavel Emelyanov
[not found] ` <47556EE8.1000605-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Pavel Emelyanov @ 2007-12-04 15:14 UTC (permalink / raw)
To: David Miller; +Cc: Samuel Ortiz, irda-users, Linux Netdev List, devel
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][IRDA] Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS
[not found] ` <47556EE8.1000605-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
@ 2007-12-05 10:19 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2007-12-05 10:19 UTC (permalink / raw)
To: xemul-GEFAQzZX7r8dnm+yROfE0A
Cc: irda-users-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
samuel-jcdQHdrhKHMdnm+yROfE0A, devel-GEFAQzZX7r8dnm+yROfE0A,
netdev-u79uwXL29TY76Z2rM5mHXA
From: Pavel Emelyanov <xemul-GEFAQzZX7r8dnm+yROfE0A@public.gmane.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-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
Also applied to net-2.6, thanks!
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-12-05 10:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-04 15:14 [PATCH][IRDA] Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS Pavel Emelyanov
[not found] ` <47556EE8.1000605-GEFAQzZX7r8dnm+yROfE0A@public.gmane.org>
2007-12-05 10:19 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).