From: Andrew Morton <akpm@linux-foundation.org>

The standard ifdef-avoidance trick.

Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/3c509.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff -puN drivers/net/3c509.c~3c509-convert-to-isa_driver-and-pnp_driver-v4-cleanup drivers/net/3c509.c
--- a/drivers/net/3c509.c~3c509-convert-to-isa_driver-and-pnp_driver-v4-cleanup
+++ a/drivers/net/3c509.c
@@ -376,15 +376,16 @@ static int el3_isa_resume(struct device 
 	outw(0x0f00, ioaddr + WN0_IRQ);
 	return el3_resume(dev);
 }
+#else
+#define el3_isa_suspend NULL
+#define el3_isa_resume NULL
 #endif
 
 static struct isa_driver el3_isa_driver = {
 	.match		= el3_isa_match,
 	.remove		= __devexit_p(el3_isa_remove),
-#ifdef CONFIG_PM
 	.suspend	= el3_isa_suspend,
 	.resume		= el3_isa_resume,
-#endif
 	.driver		= {
 		.name	= "3c509"
 	},
@@ -459,6 +460,9 @@ static int el3_pnp_resume(struct pnp_dev
 {
 	return el3_resume(&pdev->dev);
 }
+#else
+#define el3_pnp_suspend NULL
+#define el3_pnp_resume NULL
 #endif
 
 static struct pnp_driver el3_pnp_driver = {
@@ -466,10 +470,8 @@ static struct pnp_driver el3_pnp_driver 
 	.id_table	= el3_pnp_ids,
 	.probe		= el3_pnp_probe,
 	.remove		= __devexit_p(el3_pnp_remove),
-#ifdef CONFIG_PM
 	.suspend	= el3_pnp_suspend,
 	.resume		= el3_pnp_resume,
-#endif
 };
 static int pnp_registered;
 #endif /* CONFIG_PNP */
_