summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorJiri Benc <jbenc@suse.cz>2005-08-25 20:08:22 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-25 20:08:22 -0400
commit771abed990d8642f289f733dc0fa8a395ab31ca1 (patch)
tree576836a8eb68aeb27741199e0a6f0a2382fdf85e /drivers/net/wireless
parent3ce329cec29b788bd5d9aaa446fd7ecdd4df64fe (diff)
This removes support for old (and non-mainline) kernels from ipw2200.
Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Jiri Benc <jbenc@suse.cz>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ipw2200.c8
-rw-r--r--drivers/net/wireless/ipw2200.h20
2 files changed, 0 insertions, 28 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 6211438058d..fe328671192 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -6617,11 +6617,7 @@ static int ipw_setup_deferred_work(struct ipw_priv *priv)
{
int ret = 0;
-#ifdef CONFIG_SOFTWARE_SUSPEND2
- priv->workqueue = create_workqueue(DRV_NAME, 0);
-#else
priv->workqueue = create_workqueue(DRV_NAME);
-#endif
init_waitqueue_head(&priv->wait_command_queue);
INIT_WORK(&priv->adhoc_check, ipw_adhoc_check, priv);
@@ -7242,11 +7238,7 @@ static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
/* Remove the PRESENT state of the device */
netif_device_detach(dev);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- pci_save_state(pdev, priv->pm_state);
-#else
pci_save_state(pdev);
-#endif
pci_disable_device(pdev);
pci_set_power_state(pdev, state);
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h
index 78b5f444271..746bcdb1c29 100644
--- a/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@ -53,26 +53,6 @@
#include <linux/workqueue.h>
-#ifndef IRQ_NONE
-typedef void irqreturn_t;
-#define IRQ_NONE
-#define IRQ_HANDLED
-#define IRQ_RETVAL(x)
-#endif
-
-#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) )
-#define __iomem
-#endif
-
-#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
-#define pci_dma_sync_single_for_cpu pci_dma_sync_single
-#define pci_dma_sync_single_for_device pci_dma_sync_single
-#endif
-
-#ifndef HAVE_FREE_NETDEV
-#define free_netdev(x) kfree(x)
-#endif
-
/* Authentication and Association States */
enum connection_manager_assoc_states
{