From 98dd44f0214650e63e7af0d20ce3bcfd6a4d5f56 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Sun, 1 Jul 2007 12:06:49 -0700
Subject: [PATCH] --- yaml --- r: 58124 b: refs/heads/master c:
 cbcdd772ff43de58cc0d9de76ae9d05e2dd98bc0 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/irda/smsc-ircc2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ca5076a1b17a..b95d1e35c7ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84288ad89e9736c7478e138f247397b9ab7a9d28
+refs/heads/master: cbcdd772ff43de58cc0d9de76ae9d05e2dd98bc0
diff --git a/trunk/drivers/net/irda/smsc-ircc2.c b/trunk/drivers/net/irda/smsc-ircc2.c
index 2803b370ba01..36ab98386be0 100644
--- a/trunk/drivers/net/irda/smsc-ircc2.c
+++ b/trunk/drivers/net/irda/smsc-ircc2.c
@@ -79,7 +79,7 @@ MODULE_AUTHOR("Daniele Peri <peri@csai.unipa.it>");
 MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");
 MODULE_LICENSE("GPL");
 
-static int smsc_nopnp;
+static int smsc_nopnp = 1;
 module_param_named(nopnp, smsc_nopnp, bool, 0);
 MODULE_PARM_DESC(nopnp, "Do not use PNP to detect controller settings");