fixes for 2.2.x
This commit is contained in:
parent
8e85931317
commit
f15abee7ae
1
CHANGES
1
CHANGES
|
@ -41,6 +41,7 @@
|
|||
* Intersil Corporation as part of PRISM(R) chipset product development.
|
||||
*
|
||||
* --------------------------------------------------------------------
|
||||
- Compile fixes for 2.2.x introduced as part of the new hotplug support.
|
||||
- Added man pages contributed by Joey Hess
|
||||
- Add ident info for the Z-Com 725/726 USB Widgets.
|
||||
- Fixes to silence GCC3.2 warnings. (Pavel Roskin)
|
||||
|
|
|
@ -300,9 +300,11 @@ static unsigned long pci_resource_len (struct pci_dev *dev, int n_base)
|
|||
/*-----------------------------------------------------------------*/
|
||||
|
||||
#if (WLAN_HOSTIF == WLAN_PLX || WLAN_HOSTIF == WLAN_PCI)
|
||||
#ifdef CONFIG_PM
|
||||
static int prism2sta_suspend_pci(struct pci_dev *pdev, u32 state);
|
||||
static int prism2sta_resume_pci(struct pci_dev *pdev);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if (WLAN_HOSTIF == WLAN_PLX)
|
||||
static struct pci_device_id plx_id_tbl[] = {
|
||||
|
@ -3542,7 +3544,9 @@ prism2sta_probe_pci(
|
|||
}
|
||||
}
|
||||
|
||||
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,0))
|
||||
memcpy(wlandev->slotname, pdev->slot_name, sizeof(pdev->slot_name));
|
||||
#endif
|
||||
pci_set_drvdata(pdev, wlandev);
|
||||
|
||||
/* Shouldn't actually hook up the IRQ until we
|
||||
|
|
Loading…
Reference in a new issue