Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[net-next-2.6.git] / net / irda / irnet / irnet_ppp.c

diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c
index 0993bd454ea5811b3b72a66e33a49a1288ea7c04..7fa86373de414a810be41e6973027d0b31c12168 100644 (file)
--- a/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@ -664,7 +664,7 @@ dev_irnet_ioctl(
       if((val == N_SYNC_PPP) || (val == N_PPP))
        {
          DEBUG(FS_INFO, "Entering PPP discipline.\n");
-         /* PPP channel setup (ap->chan in configued in dev_irnet_open())*/
+         /* PPP channel setup (ap->chan in configured in dev_irnet_open())*/
          if (mutex_lock_interruptible(&ap->lock))
                  return -EINTR;