From aeef74ae40d87311f3547cc278d6208faeeb5264 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 8 Oct 2008 19:54:31 -0700
Subject: [PATCH] --- yaml --- r: 112217 b: refs/heads/master c:
 724f88057609c00d6e973c3a7e0eb72f8eec2da9 h: refs/heads/master i:   112215:
 d358039cc41dcac6d0b9fa32a5698c577530f058 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/jme.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7587ce0ec91a..a98d9ad8b653 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dc0c97fdcf63cf65a5857ad739a41f9eac9f2fc
+refs/heads/master: 724f88057609c00d6e973c3a7e0eb72f8eec2da9
diff --git a/trunk/drivers/net/jme.c b/trunk/drivers/net/jme.c
index 3ab2442cd228..5f9a1313fa3e 100644
--- a/trunk/drivers/net/jme.c
+++ b/trunk/drivers/net/jme.c
@@ -1593,6 +1593,7 @@ jme_open(struct net_device *netdev)
 	return rc;
 }
 
+#ifdef CONFIG_PM
 static void
 jme_set_100m_half(struct jme_adapter *jme)
 {
@@ -1625,6 +1626,7 @@ jme_wait_link(struct jme_adapter *jme)
 		phylink = jme_linkstat_from_phy(jme);
 	}
 }
+#endif
 
 static inline void
 jme_phy_off(struct jme_adapter *jme)
@@ -2912,6 +2914,7 @@ jme_remove_one(struct pci_dev *pdev)
 
 }
 
+#ifdef CONFIG_PM
 static int
 jme_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -2991,6 +2994,7 @@ jme_resume(struct pci_dev *pdev)
 
 	return 0;
 }
+#endif
 
 static struct pci_device_id jme_pci_tbl[] = {
 	{ PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC250) },