Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a1aa309 authored by Ingo Molnar's avatar Ingo Molnar Committed by David S. Miller
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c17f888f

drivers/net/irda/smsc-ircc2.c

+4 −1
Original line number Diff line number Diff line
@@ -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



/*******************************************************************************

 *