diff options
author | James Ketrenos <jketreno@linux.intel.com> | 2005-09-15 02:00:31 -0400 |
---|---|---|
committer | James Ketrenos <jketreno@linux.intel.com> | 2005-11-07 18:51:52 -0500 |
commit | 87bb5e3814572b85cf5d4650fb1f88267411845f (patch) | |
tree | b4e20691e20077eaee00eab3266b32f3c1b7da05 /drivers/net/wireless/ipw2100.c | |
parent | 9ef539d0d6fca1cd0b1f9b884be8b92cb80159c9 (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/wireless/ipw2100.c')
-rw-r--r-- | drivers/net/wireless/ipw2100.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index dba1049bcf91..ed4f1a5e6b0a 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) | |||
6709 | } | 6709 | } |
6710 | 6710 | ||
6711 | #ifdef CONFIG_PM | 6711 | #ifdef CONFIG_PM |
6712 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) | ||
6713 | static int ipw2100_suspend(struct pci_dev *pci_dev, u32 state) | ||
6714 | #else | ||
6715 | static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state) | 6712 | static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state) |
6716 | #endif | ||
6717 | { | 6713 | { |
6718 | struct ipw2100_priv *priv = pci_get_drvdata(pci_dev); | 6714 | struct ipw2100_priv *priv = pci_get_drvdata(pci_dev); |
6719 | struct net_device *dev = priv->net_dev; | 6715 | struct net_device *dev = priv->net_dev; |