diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-18 16:32:18 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-18 20:58:20 +0100 |
| commit | 287ea7f6ddcbfcb717f1b97fc7ec1a0545bd40cf (patch) | |
| tree | 5a6b9d695a6100e52d37454fe121880e3db3fd63 /patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch | |
| parent | 3ad59ccd549f430ea167ecb646a726d05fd055ed (diff) | |
backports: refresh on next-20140106backports-20140106
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.2.54 [ OK ]
19 3.3.8 [ OK ]
20 3.4.77 [ OK ]
21 3.5.7 [ OK ]
22 3.6.11 [ OK ]
23 3.7.10 [ OK ]
24 3.8.13 [ OK ]
25 3.9.11 [ OK ]
26 3.10.27 [ OK ]
27 3.11.10 [ OK ]
28 3.12.8 [ OK ]
29 3.13-rc8 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch')
| -rw-r--r-- | patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch index 2941af93..0cdaec3f 100644 --- a/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch +++ b/patches/collateral-evolutions/network/24-pcmcia/drivers_net_wireless_orinoco_spectrum_cs.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c -@@ -170,6 +170,16 @@ spectrum_cs_probe(struct pcmcia_device * +@@ -169,6 +169,16 @@ spectrum_cs_probe(struct pcmcia_device * card->p_dev = link; link->priv = priv; @@ -17,7 +17,7 @@ return spectrum_cs_config(link); } /* spectrum_cs_attach */ -@@ -184,6 +194,7 @@ static void spectrum_cs_detach(struct pc +@@ -183,6 +193,7 @@ static void spectrum_cs_detach(struct pc free_orinocodev(priv); } /* spectrum_cs_detach */ @@ -25,7 +25,7 @@ static int spectrum_cs_config_check(struct pcmcia_device *p_dev, void *priv_data) { -@@ -192,6 +203,98 @@ static int spectrum_cs_config_check(stru +@@ -191,6 +202,98 @@ static int spectrum_cs_config_check(stru return pcmcia_request_io(p_dev); }; @@ -124,7 +124,7 @@ static int spectrum_cs_config(struct pcmcia_device *link) -@@ -201,10 +304,12 @@ spectrum_cs_config(struct pcmcia_device +@@ -200,10 +303,12 @@ spectrum_cs_config(struct pcmcia_device int ret; void __iomem *mem; @@ -137,7 +137,7 @@ ret = pcmcia_loop_config(link, spectrum_cs_config_check, NULL); if (ret) { if (!ignore_cis_vcc) -@@ -214,8 +319,12 @@ spectrum_cs_config(struct pcmcia_device +@@ -213,8 +318,12 @@ spectrum_cs_config(struct pcmcia_device goto failed; } @@ -150,7 +150,7 @@ if (!mem) goto failed; -@@ -225,7 +334,11 @@ spectrum_cs_config(struct pcmcia_device +@@ -224,7 +333,11 @@ spectrum_cs_config(struct pcmcia_device hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); hw->eeprom_pda = true; @@ -162,7 +162,7 @@ if (ret) goto failed; -@@ -244,8 +357,16 @@ spectrum_cs_config(struct pcmcia_device +@@ -243,8 +356,16 @@ spectrum_cs_config(struct pcmcia_device } /* Register an interface with the stack */ @@ -179,7 +179,7 @@ printk(KERN_ERR PFX "orinoco_if_add() failed\n"); goto failed; } -@@ -311,7 +432,13 @@ MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ +@@ -310,7 +431,13 @@ MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ static struct pcmcia_driver orinoco_driver = { .owner = THIS_MODULE, |