aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda/irlmp_event.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-17 15:09:59 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-17 15:09:59 -0500
commit48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch)
treeda3aa535c98cc0957851354ceb0fbff7482d7a9d /net/irda/irlmp_event.c
parent1a1689344add3333d28d1b5495d8043a3877d01c (diff)
parent4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff)
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'net/irda/irlmp_event.c')
-rw-r--r--net/irda/irlmp_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c
index 4c90dd1b4503..65ffa981510a 100644
--- a/net/irda/irlmp_event.c
+++ b/net/irda/irlmp_event.c
@@ -615,7 +615,7 @@ static int irlmp_state_connect(struct lsap_cb *self, IRLMP_EVENT event,
615 default: 615 default:
616 /* LM_LAP_DISCONNECT_INDICATION : Should never happen, we 616 /* LM_LAP_DISCONNECT_INDICATION : Should never happen, we
617 * are *not* yet bound to the IrLAP link. Jean II */ 617 * are *not* yet bound to the IrLAP link. Jean II */
618 IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n", 618 IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n",
619 __FUNCTION__, irlmp_event[event], self->slsap_sel); 619 __FUNCTION__, irlmp_event[event], self->slsap_sel);
620 break; 620 break;
621 } 621 }