diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-03-28 10:54:43 -0600 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-03 17:08:46 +1100 |
| commit | 62e7ba73b399573292abc10c824a98a807029e95 (patch) | |
| tree | caaf2f2cf0d486179e6a7347b5ec70ef5a58391a | |
| parent | 0868f271000955aa59f01e29d0cf10ad11b3b3f2 (diff) | |
nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP
Wrap PNP probe code in #ifdef CONFIG_PNP.
Without this change, we'll have unresolved references to
pnp_get_resource() function when CONFIG_PNP=n. (This is a
new interface that's not in mainline yet.)
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
| -rw-r--r-- | drivers/net/irda/nsc-ircc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index a873d2b315ca..db8841343b58 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c @@ -100,7 +100,6 @@ static int nsc_ircc_probe_39x(nsc_chip_t *chip, chipio_t *info); static int nsc_ircc_init_108(nsc_chip_t *chip, chipio_t *info); static int nsc_ircc_init_338(nsc_chip_t *chip, chipio_t *info); static int nsc_ircc_init_39x(nsc_chip_t *chip, chipio_t *info); -static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id); /* These are the known NSC chips */ static nsc_chip_t chips[] = { @@ -145,8 +144,10 @@ static char *dongle_types[] = { "No dongle connected", }; -/* PNP probing */ static chipio_t pnp_info; + +#ifdef CONFIG_PNP +/* PNP probing */ static const struct pnp_device_id nsc_ircc_pnp_table[] = { { .id = "NSC6001", .driver_data = 0 }, { .id = "IBM0071", .driver_data = 0 }, @@ -155,11 +156,16 @@ static const struct pnp_device_id nsc_ircc_pnp_table[] = { MODULE_DEVICE_TABLE(pnp, nsc_ircc_pnp_table); +static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id); + static struct pnp_driver nsc_ircc_pnp_driver = { .name = "nsc-ircc", .id_table = nsc_ircc_pnp_table, .probe = nsc_ircc_pnp_probe, }; +#else +static struct pnp_driver nsc_ircc_pnp_driver; +#endif /* Some prototypes */ static int nsc_ircc_open(chipio_t *info); @@ -916,6 +922,7 @@ static int nsc_ircc_probe_39x(nsc_chip_t *chip, chipio_t *info) return 0; } +#ifdef CONFIG_PNP /* PNP probing */ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id) { @@ -952,6 +959,7 @@ static int nsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *i return 0; } +#endif /* * Function nsc_ircc_setup (info) |