---

yaml --- r: 10947 b: refs/heads/master c: 977e74b h: refs/heads/master i: 10945: 9a83d4d 10943: 31ef474 v: v3
git-mirror · Oct 28, 2005 · d803b35 · d803b35
1 parent fb01cc1
commit d803b35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c36ed22c6f64de94c6c3b7258dd7285bb093401
+refs/heads/master: 977e74b5f60de3df9831897b726c16870878eee4
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
@@ -191,8 +191,8 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
 static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
 static void e1000_restore_vlan(struct e1000_adapter *adapter);
 
-static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
 #ifdef CONFIG_PM
+static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
 static int e1000_resume(struct pci_dev *pdev);
 #endif