From e6b9bc3ebe9d4f6a819b002a52c6b0687224149b Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 5 May 2008 01:06:54 -0700 Subject: [PATCH] --- yaml --- r: 96073 b: refs/heads/master c: 7a1aa309f21ea2f6c31f364341e4027ecf4e79bc h: refs/heads/master i: 96071: 0f0b0a43fe6f14806e6e3afc84013da0dcd3f953 v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/smsc-ircc2.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2c4b49d74921..691c395ccd1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c17f888f8fc2e47e2b4a51424f8ccf564ae87576 +refs/heads/master: 7a1aa309f21ea2f6c31f364341e4027ecf4e79bc diff --git a/trunk/drivers/net/irda/smsc-ircc2.c b/trunk/drivers/net/irda/smsc-ircc2.c index 1f26da761e9f..cfe0194fef71 100644 --- a/trunk/drivers/net/irda/smsc-ircc2.c +++ b/trunk/drivers/net/irda/smsc-ircc2.c @@ -376,6 +376,7 @@ MODULE_DEVICE_TABLE(pnp, smsc_ircc_pnp_table); static int pnp_driver_registered; +#ifdef CONFIG_PNP static int __init smsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id) { @@ -402,7 +403,9 @@ static struct pnp_driver smsc_ircc_pnp_driver = { .id_table = smsc_ircc_pnp_table, .probe = smsc_ircc_pnp_probe, }; - +#else /* CONFIG_PNP */ +static struct pnp_driver smsc_ircc_pnp_driver; +#endif /******************************************************************************* *