From: James Ketrenos <jketreno@linux.intel.com>
Date: Thu, 15 Sep 2005 06:00:31 +0000 (-0500)
Subject: Pulled out a stray KERNEL_VERSION check around the suspend handler.
X-Git-Tag: v2.6.15-rc1~69^2~10^2~10
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87bb5e3814572b85cf5d4650fb1f88267411845f;p=linux-2.6

Pulled out a stray KERNEL_VERSION check around the suspend handler.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
---

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index dba1049bcf..ed4f1a5e6b 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/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;