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

Be conventional, save an ifdef

Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Andres Salomon <dilinger@debian.org>
Cc: Andres Salomon <dilinger@queued.net>
Cc: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/video/geode/lxfb_core.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff -puN drivers/video/geode/lxfb_core.c~lxfb-add-power-management-functionality-fix drivers/video/geode/lxfb_core.c
--- a/drivers/video/geode/lxfb_core.c~lxfb-add-power-management-functionality-fix
+++ a/drivers/video/geode/lxfb_core.c
@@ -468,6 +468,9 @@ static int lxfb_resume(struct pci_dev *p
 	pdev->dev.power.power_state = PMSG_ON;
 	return 0;
 }
+#else
+#define lxfb_suspend NULL
+#define lxfb_resume NULL
 #endif
 
 static int __init lxfb_probe(struct pci_dev *pdev,
@@ -595,10 +598,8 @@ static struct pci_driver lxfb_driver = {
 	.id_table	= lxfb_id_table,
 	.probe		= lxfb_probe,
 	.remove		= lxfb_remove,
-#ifdef CONFIG_PM
 	.suspend	= lxfb_suspend,
 	.resume		= lxfb_resume,
-#endif
 };
 
 #ifndef MODULE
_