---

yaml --- r: 13591 b: refs/heads/master c: 87bb5e3 h: refs/heads/master i: 13589: 87f1ae7 13587: c522e18 13583: ecd8f7b v: v3
git-mirror · Nov 7, 2005 · 629a7a5 · 629a7a5
1 parent 5d0e9d3
commit 629a7a5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ef539d0d6fca1cd0b1f9b884be8b92cb80159c9
+refs/heads/master: 87bb5e3814572b85cf5d4650fb1f88267411845f
diff --git a/trunk/drivers/net/wireless/ipw2100.c b/trunk/drivers/net/wireless/ipw2100.c
@@ -6709,11 +6709,7 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
 }
 
 #ifdef CONFIG_PM
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
-static int ipw2100_suspend(struct pci_dev *pci_dev, u32 state)
-#else
 static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state)
-#endif
 {
 	struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
 	struct net_device *dev = priv->net_dev;