diff options
author | William Lee Irwin III <wli@holomorphy.com> | 2005-01-10 17:21:56 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-10 17:21:56 -0800 |
commit | 135a88116e7c5d7ad91430b59634d89ecf8c4bcd (patch) | |
tree | 342ae1e64c8e47fb31984828dffe126e9dd86fa2 /net | |
parent | 3f2567448a7e1b3df9620b0b36e52eee53e2c237 (diff) | |
download | history-135a88116e7c5d7ad91430b59634d89ecf8c4bcd.tar.gz |
[PATCH] make IRDA string tables conditional on CONFIG_IRDA_DEBUG
There are some string tables only used for debugging printk()'s in IRDA
that trip warnings when CONFIG_IRDA_DEBUG is not set.
This patch makes them conditional on CONFIG_IRDA_DEBUG to silence warnings.
Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/irda/ircomm/ircomm_event.c | 2 | ||||
-rw-r--r-- | net/irda/ircomm/ircomm_tty_attach.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/irda/ircomm/ircomm_event.c b/net/irda/ircomm/ircomm_event.c index 606b4e2a0a0f9b..01f4e801a1ba6b 100644 --- a/net/irda/ircomm/ircomm_event.c +++ b/net/irda/ircomm/ircomm_event.c @@ -57,6 +57,7 @@ char *ircomm_state[] = { "IRCOMM_CONN", }; +#ifdef CONFIG_IRDA_DEBUG static char *ircomm_event[] = { "IRCOMM_CONNECT_REQUEST", "IRCOMM_CONNECT_RESPONSE", @@ -75,6 +76,7 @@ static char *ircomm_event[] = { "IRCOMM_CONTROL_REQUEST", "IRCOMM_CONTROL_INDICATION", }; +#endif /* CONFIG_IRDA_DEBUG */ static int (*state[])(struct ircomm_cb *self, IRCOMM_EVENT event, struct sk_buff *skb, struct ircomm_info *info) = diff --git a/net/irda/ircomm/ircomm_tty_attach.c b/net/irda/ircomm/ircomm_tty_attach.c index 41a6aa415040dd..e01be889abed85 100644 --- a/net/irda/ircomm/ircomm_tty_attach.c +++ b/net/irda/ircomm/ircomm_tty_attach.c @@ -91,6 +91,7 @@ char *ircomm_tty_state[] = { "*** ERROR *** ", }; +#ifdef CONFIG_IRDA_DEBUG static char *ircomm_tty_event[] = { "IRCOMM_TTY_ATTACH_CABLE", "IRCOMM_TTY_DETACH_CABLE", @@ -107,6 +108,7 @@ static char *ircomm_tty_event[] = { "IRCOMM_TTY_GOT_LSAPSEL", "*** ERROR ****", }; +#endif /* CONFIG_IRDA_DEBUG */ static int (*state[])(struct ircomm_tty_cb *self, IRCOMM_TTY_EVENT event, struct sk_buff *skb, struct ircomm_tty_info *info) = |