diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2005-01-12 22:50:27 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2005-01-12 22:50:27 -0800 |
| commit | 0f76379ca92b8aee2771373e55a67f2631529506 (patch) | |
| tree | cee1399116d9051cfd714b4b1c5207929d15e7e9 /net | |
| parent | 240cdcf7cc2bdc55bc13a065dc737efc5e3d54ba (diff) | |
| parent | de10f9d45f6836709d77629cda7ad4e743e32cbe (diff) | |
| download | history-0f76379ca92b8aee2771373e55a67f2631529506.tar.gz | |
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
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) = |