aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJames Ketrenos <jketreno@linux.intel.com>2005-09-15 01:00:31 -0500
committerJames Ketrenos <jketreno@linux.intel.com>2005-11-07 17:51:52 -0600
commit87bb5e3814572b85cf5d4650fb1f88267411845f (patch)
treeb4e20691e20077eaee00eab3266b32f3c1b7da05 /drivers/net
parent9ef539d0d6fca1cd0b1f9b884be8b92cb80159c9 (diff)
Pulled out a stray KERNEL_VERSION check around the suspend handler.
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ipw2100.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index dba1049bcf9..ed4f1a5e6b0 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;