Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7a1aa309f21ea2f6c31f364341e4027ecf4e79bc

Authored by Ingo Molnar
Committed by David S. Miller
1 parent c17f888f8f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

irda: fix !PNP support for drivers/net/irda/smsc-ircc2.c 

x86.git testing found this build bug on v2.6.26-rc1:

  ERROR: "pnp_get_resource" [drivers/net/irda/smsc-ircc2.ko] undefined!
  make[1]: *** [__modpost] Error 1
  make: *** [modules] Error 2

the driver did not anticipate the case of !CONFIG_PNP which is rare but
still possible. Instead of restricting the driver to PNP-only in the
Kconfig space, add the (trivial) dummy struct pnp_driver - this is that
other drivers use in the !PNP case too.

The driver itself can in theory be initialized on !PNP too in certain
cases, via smsc_ircc_legacy_probe().

Patch only minimally build tested, i dont have this hardware.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff

drivers/net/irda/smsc-ircc2.c
Diff comments   View file @ 7a1aa30
... ... @@ -376,6 +376,7 @@
376 376  
377 377 static int pnp_driver_registered;
378 378  
  379 +#ifdef CONFIG_PNP
379 380 static int __init smsc_ircc_pnp_probe(struct pnp_dev *dev,
380 381 const struct pnp_device_id *dev_id)
381 382 {
... ... @@ -402,7 +403,9 @@
402 403 .id_table = smsc_ircc_pnp_table,
403 404 .probe = smsc_ircc_pnp_probe,
404 405 };
405   -
  406 +#else /* CONFIG_PNP */
  407 +static struct pnp_driver smsc_ircc_pnp_driver;
  408 +#endif
406 409  
407 410 /*******************************************************************************
408 411 *