diff options
author | Jiri Benc <jbenc@suse.cz> | 2005-08-25 20:08:22 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-25 20:08:22 -0400 |
commit | 771abed990d8642f289f733dc0fa8a395ab31ca1 (patch) | |
tree | 576836a8eb68aeb27741199e0a6f0a2382fdf85e /drivers | |
parent | 3ce329cec29b788bd5d9aaa446fd7ecdd4df64fe (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')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2200.h | 20 |
2 files changed, 0 insertions, 28 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 6211438058de..fe328671192d 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) | |||
6617 | { | 6617 | { |
6618 | int ret = 0; | 6618 | int ret = 0; |
6619 | 6619 | ||
6620 | #ifdef CONFIG_SOFTWARE_SUSPEND2 | ||
6621 | priv->workqueue = create_workqueue(DRV_NAME, 0); | ||
6622 | #else | ||
6623 | priv->workqueue = create_workqueue(DRV_NAME); | 6620 | priv->workqueue = create_workqueue(DRV_NAME); |
6624 | #endif | ||
6625 | init_waitqueue_head(&priv->wait_command_queue); | 6621 | init_waitqueue_head(&priv->wait_command_queue); |
6626 | 6622 | ||
6627 | INIT_WORK(&priv->adhoc_check, ipw_adhoc_check, priv); | 6623 | INIT_WORK(&priv->adhoc_check, ipw_adhoc_check, priv); |
@@ -7242,11 +7238,7 @@ static int ipw_pci_suspend(struct pci_dev *pdev, u32 state) | |||
7242 | /* Remove the PRESENT state of the device */ | 7238 | /* Remove the PRESENT state of the device */ |
7243 | netif_device_detach(dev); | 7239 | netif_device_detach(dev); |
7244 | 7240 | ||
7245 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) | ||
7246 | pci_save_state(pdev, priv->pm_state); | ||
7247 | #else | ||
7248 | pci_save_state(pdev); | 7241 | pci_save_state(pdev); |
7249 | #endif | ||
7250 | pci_disable_device(pdev); | 7242 | pci_disable_device(pdev); |
7251 | pci_set_power_state(pdev, state); | 7243 | pci_set_power_state(pdev, state); |
7252 | 7244 | ||
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h index 78b5f444271d..746bcdb1c297 100644 --- a/drivers/net/wireless/ipw2200.h +++ b/drivers/net/wireless/ipw2200.h | |||
@@ -53,26 +53,6 @@ | |||
53 | 53 | ||
54 | #include <linux/workqueue.h> | 54 | #include <linux/workqueue.h> |
55 | 55 | ||
56 | #ifndef IRQ_NONE | ||
57 | typedef void irqreturn_t; | ||
58 | #define IRQ_NONE | ||
59 | #define IRQ_HANDLED | ||
60 | #define IRQ_RETVAL(x) | ||
61 | #endif | ||
62 | |||
63 | #if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) ) | ||
64 | #define __iomem | ||
65 | #endif | ||
66 | |||
67 | #if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) ) | ||
68 | #define pci_dma_sync_single_for_cpu pci_dma_sync_single | ||
69 | #define pci_dma_sync_single_for_device pci_dma_sync_single | ||
70 | #endif | ||
71 | |||
72 | #ifndef HAVE_FREE_NETDEV | ||
73 | #define free_netdev(x) kfree(x) | ||
74 | #endif | ||
75 | |||
76 | /* Authentication and Association States */ | 56 | /* Authentication and Association States */ |
77 | enum connection_manager_assoc_states | 57 | enum connection_manager_assoc_states |
78 | { | 58 | { |