diff options
author | David S. Miller <davem@davemloft.net> | 2008-10-08 22:54:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-08 22:54:31 -0400 |
commit | 724f88057609c00d6e973c3a7e0eb72f8eec2da9 (patch) | |
tree | 10d556773e163bd24183f3aad332be76e558b3ff | |
parent | 6dc0c97fdcf63cf65a5857ad739a41f9eac9f2fc (diff) |
jme: Fix warnings with CONFIG_PM disabled.
drivers/net/jme.c:1598: warning: ‘jme_set_100m_half’ defined but not used
drivers/net/jme.c:1618: warning: ‘jme_wait_link’ defined but not used
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/jme.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index 3ab2442cd228..5f9a1313fa3e 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c | |||
@@ -1593,6 +1593,7 @@ err_out: | |||
1593 | return rc; | 1593 | return rc; |
1594 | } | 1594 | } |
1595 | 1595 | ||
1596 | #ifdef CONFIG_PM | ||
1596 | static void | 1597 | static void |
1597 | jme_set_100m_half(struct jme_adapter *jme) | 1598 | jme_set_100m_half(struct jme_adapter *jme) |
1598 | { | 1599 | { |
@@ -1625,6 +1626,7 @@ jme_wait_link(struct jme_adapter *jme) | |||
1625 | phylink = jme_linkstat_from_phy(jme); | 1626 | phylink = jme_linkstat_from_phy(jme); |
1626 | } | 1627 | } |
1627 | } | 1628 | } |
1629 | #endif | ||
1628 | 1630 | ||
1629 | static inline void | 1631 | static inline void |
1630 | jme_phy_off(struct jme_adapter *jme) | 1632 | jme_phy_off(struct jme_adapter *jme) |
@@ -2912,6 +2914,7 @@ jme_remove_one(struct pci_dev *pdev) | |||
2912 | 2914 | ||
2913 | } | 2915 | } |
2914 | 2916 | ||
2917 | #ifdef CONFIG_PM | ||
2915 | static int | 2918 | static int |
2916 | jme_suspend(struct pci_dev *pdev, pm_message_t state) | 2919 | jme_suspend(struct pci_dev *pdev, pm_message_t state) |
2917 | { | 2920 | { |
@@ -2991,6 +2994,7 @@ jme_resume(struct pci_dev *pdev) | |||
2991 | 2994 | ||
2992 | return 0; | 2995 | return 0; |
2993 | } | 2996 | } |
2997 | #endif | ||
2994 | 2998 | ||
2995 | static struct pci_device_id jme_pci_tbl[] = { | 2999 | static struct pci_device_id jme_pci_tbl[] = { |
2996 | { PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC250) }, | 3000 | { PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC250) }, |