From 629a7a559d90ad52c5c55e3c21879da33acaff81 Mon Sep 17 00:00:00 2001
From: James Ketrenos <jketreno@linux.intel.com>
Date: Thu, 15 Sep 2005 01:00:31 -0500
Subject: [PATCH] --- yaml --- r: 13591 b: refs/heads/master c:
 87bb5e3814572b85cf5d4650fb1f88267411845f h: refs/heads/master i:   13589:
 87f1ae748b087240f81e9a63fb4088ac8b393993   13587:
 c522e18471316bc90ce3d34ddf6ae8041b21a140   13583:
 ecd8f7b5744d6f76069d0617c50007b8c718b3c0 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/wireless/ipw2100.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8e8fd88c6cb4..1da17800c79b 100644
--- 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
index dba1049bcf91..ed4f1a5e6b0a 100644
--- 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;