]> err.no Git - linux-2.6/commitdiff
Pulled out a stray KERNEL_VERSION check around the suspend handler.
authorJames Ketrenos <jketreno@linux.intel.com>
Thu, 15 Sep 2005 06:00:31 +0000 (01:00 -0500)
committerJames Ketrenos <jketreno@linux.intel.com>
Mon, 7 Nov 2005 23:51:52 +0000 (17:51 -0600)
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
drivers/net/wireless/ipw2100.c

index dba1049bcf91f69b2c5119a70bccd1422a882686..ed4f1a5e6b0a68e771edef986c1466931e8375d7 100644 (file)
@@ -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;