|
|
@ -12,11 +12,9 @@ Signed-off-by: Oliver Winker <oliver@oli1170.net> |
|
|
|
pci.c | 26 +++++++++++++++++++++++++-
|
|
|
|
pci.c | 26 +++++++++++++++++++++++++-
|
|
|
|
2 files changed, 37 insertions(+), 2 deletions(-)
|
|
|
|
2 files changed, 37 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/mem.c b/mem.c
|
|
|
|
|
|
|
|
index 87e01f1..f1ff7e2 100644
|
|
|
|
|
|
|
|
--- a/mem.c
|
|
|
|
--- a/mem.c
|
|
|
|
+++ b/mem.c
|
|
|
|
+++ b/mem.c
|
|
|
|
@@ -2216,7 +2216,11 @@ int acx100mem_ioctl_set_phy_amp_bias(struct ieee80211_hw *hw,
|
|
|
|
@@ -2216,7 +2216,11 @@ int acx100mem_ioctl_set_phy_amp_bias(str
|
|
|
|
* ==================================================
|
|
|
|
* ==================================================
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
@ -28,7 +26,7 @@ index 87e01f1..f1ff7e2 100644 |
|
|
|
{
|
|
|
|
{
|
|
|
|
acx_device_t *adev = NULL;
|
|
|
|
acx_device_t *adev = NULL;
|
|
|
|
const char *chip_name;
|
|
|
|
const char *chip_name;
|
|
|
|
@@ -2392,7 +2396,11 @@ static int __devinit acxmem_probe(struct platform_device *pdev)
|
|
|
|
@@ -2392,7 +2396,11 @@ static int __devinit acxmem_probe(struct
|
|
|
|
* pdev - ptr to PCI device structure containing info about pci
|
|
|
|
* pdev - ptr to PCI device structure containing info about pci
|
|
|
|
* configuration
|
|
|
|
* configuration
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -40,7 +38,7 @@ index 87e01f1..f1ff7e2 100644 |
|
|
|
{
|
|
|
|
{
|
|
|
|
struct ieee80211_hw *hw = (struct ieee80211_hw *)
|
|
|
|
struct ieee80211_hw *hw = (struct ieee80211_hw *)
|
|
|
|
platform_get_drvdata(pdev);
|
|
|
|
platform_get_drvdata(pdev);
|
|
|
|
@@ -2594,8 +2602,11 @@ static struct platform_driver acxmem_driver = {
|
|
|
|
@@ -2594,8 +2602,11 @@ static struct platform_driver acxmem_dri
|
|
|
|
.name = "acx-mem",
|
|
|
|
.name = "acx-mem",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
.probe = acxmem_probe,
|
|
|
|
.probe = acxmem_probe,
|
|
|
@ -53,11 +51,9 @@ index 87e01f1..f1ff7e2 100644 |
|
|
|
#ifdef CONFIG_PM
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
.suspend = acxmem_e_suspend,
|
|
|
|
.suspend = acxmem_e_suspend,
|
|
|
|
.resume = acxmem_e_resume
|
|
|
|
.resume = acxmem_e_resume
|
|
|
|
diff --git a/pci.c b/pci.c
|
|
|
|
|
|
|
|
index 1da31d1..ae07f5a 100644
|
|
|
|
|
|
|
|
--- a/pci.c
|
|
|
|
--- a/pci.c
|
|
|
|
+++ b/pci.c
|
|
|
|
+++ b/pci.c
|
|
|
|
@@ -1039,7 +1039,11 @@ int acx100pci_ioctl_set_phy_amp_bias(struct net_device *ndev,
|
|
|
|
@@ -1039,7 +1039,11 @@ int acx100pci_ioctl_set_phy_amp_bias(str
|
|
|
|
* id - ptr to the device id entry that matched this device
|
|
|
|
* id - ptr to the device id entry that matched this device
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_PCI
|
|
|
|
#ifdef CONFIG_PCI
|
|
|
@ -69,7 +65,7 @@ index 1da31d1..ae07f5a 100644 |
|
|
|
const struct pci_device_id *id)
|
|
|
|
const struct pci_device_id *id)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
unsigned long mem_region1 = 0;
|
|
|
|
unsigned long mem_region1 = 0;
|
|
|
|
@@ -1292,7 +1296,11 @@ static int __devinit acxpci_probe(struct pci_dev *pdev,
|
|
|
|
@@ -1292,7 +1296,11 @@ static int __devinit acxpci_probe(struct
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* pdev - ptr to PCI device structure containing info about pci configuration
|
|
|
|
* pdev - ptr to PCI device structure containing info about pci configuration
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -81,7 +77,7 @@ index 1da31d1..ae07f5a 100644 |
|
|
|
{
|
|
|
|
{
|
|
|
|
struct ieee80211_hw *hw
|
|
|
|
struct ieee80211_hw *hw
|
|
|
|
= (struct ieee80211_hw *) pci_get_drvdata(pdev);
|
|
|
|
= (struct ieee80211_hw *) pci_get_drvdata(pdev);
|
|
|
|
@@ -1505,7 +1513,11 @@ static struct pci_driver acxpci_driver = {
|
|
|
|
@@ -1505,7 +1513,11 @@ static struct pci_driver acxpci_driver =
|
|
|
|
.name = "acx_pci",
|
|
|
|
.name = "acx_pci",
|
|
|
|
.id_table = acxpci_id_tbl,
|
|
|
|
.id_table = acxpci_id_tbl,
|
|
|
|
.probe = acxpci_probe,
|
|
|
|
.probe = acxpci_probe,
|
|
|
@ -93,7 +89,7 @@ index 1da31d1..ae07f5a 100644 |
|
|
|
#ifdef CONFIG_PM
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
.suspend = acxpci_e_suspend,
|
|
|
|
.suspend = acxpci_e_suspend,
|
|
|
|
.resume = acxpci_e_resume
|
|
|
|
.resume = acxpci_e_resume
|
|
|
|
@@ -1603,8 +1615,12 @@ static struct vlynq_device_id acx_vlynq_id[] = {
|
|
|
|
@@ -1603,8 +1615,12 @@ static struct vlynq_device_id acx_vlynq_
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -107,7 +103,7 @@ index 1da31d1..ae07f5a 100644 |
|
|
|
{
|
|
|
|
{
|
|
|
|
int result = -EIO, i;
|
|
|
|
int result = -EIO, i;
|
|
|
|
u32 addr;
|
|
|
|
u32 addr;
|
|
|
|
@@ -1785,7 +1801,11 @@ static __devinit int vlynq_probe(struct vlynq_device *vdev,
|
|
|
|
@@ -1785,7 +1801,11 @@ static __devinit int vlynq_probe(struct
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -119,7 +115,7 @@ index 1da31d1..ae07f5a 100644 |
|
|
|
{
|
|
|
|
{
|
|
|
|
struct ieee80211_hw *hw = vlynq_get_drvdata(vdev);
|
|
|
|
struct ieee80211_hw *hw = vlynq_get_drvdata(vdev);
|
|
|
|
acx_device_t *adev = hw2adev(hw);
|
|
|
|
acx_device_t *adev = hw2adev(hw);
|
|
|
|
@@ -1851,7 +1871,11 @@ static struct vlynq_driver acxvlynq_driver = {
|
|
|
|
@@ -1851,7 +1871,11 @@ static struct vlynq_driver acxvlynq_driv
|
|
|
|
.name = "acx_vlynq",
|
|
|
|
.name = "acx_vlynq",
|
|
|
|
.id_table = acx_vlynq_id,
|
|
|
|
.id_table = acx_vlynq_id,
|
|
|
|
.probe = vlynq_probe,
|
|
|
|
.probe = vlynq_probe,
|
|
|
@ -131,6 +127,3 @@ index 1da31d1..ae07f5a 100644 |
|
|
|
};
|
|
|
|
};
|
|
|
|
#endif /* CONFIG_VLYNQ */
|
|
|
|
#endif /* CONFIG_VLYNQ */
|
|
|
|
|
|
|
|
|
|
|
|
--
|
|
|
|
|
|
|
|
1.8.4.rc1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|