aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/winbond
Commit message (Collapse)AuthorAgeFilesLines
* USB: winbond: remove __devinit* from the struct usb_device_id tableGreg Kroah-Hartman2012-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | commit 43a34695d9cd79c6659f09da6d3b0624f3dd169f upstream. This structure needs to always stick around, even if CONFIG_HOTPLUG is disabled, otherwise we can oops when trying to probe a device that was added after the structure is thrown away. Thanks to Fengguang Wu and Bjørn Mork for tracking this issue down. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Reported-by: Bjørn Mork <bjorn@mork.no> CC: Pavel Machek <pavel@ucw.cz> CC: Paul Gortmaker <paul.gortmaker@windriver.com> CC: "John W. Linville" <linville@tuxdriver.com> CC: Eliad Peller <eliad@wizery.com> CC: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: winbond: wb35tx.c: Fixed coding styleKarthigan Srinivasan2011-04-201-2/+1
| | | | | | | | | | issue. Fixed coding style issue. Signed-off-by: Karthigan Srinivasan <karthigan.srinivasan2@gmail.com> Acked-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: merge 2.6.39-rc3 into staging-nextGreg Kroah-Hartman2011-04-131-1/+1
|\ | | | | | | | | | | | | This was done to handle a number of conflicts, the majority of which were caused by the big "fix spelling issues" patch. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Fix common misspellingsLucas De Marchi2011-03-311-1/+1
| | | | | | | | | | | | Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
* | staging: winbond/mto.c: remove unused variablesJonathan Neuschäfer2011-04-041-10/+0
| | | | | | | | | | | | | | | | | | | | They are unused since commit a22517fec0b13b5813932a3583a2b11a2ee17f5d: Staging: w35und: remove dead code from mto.c Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> Acked-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: winbond: fixing some code styles issuesChihau Chau2011-04-041-4/+4
|/ | | | | | | This patch fix some code style warnings found by the checkpatch.pl script, changing spaces for a tab Signed-off-by: Chihau Chau <chihau@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-03-161-4/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits) bonding: enable netpoll without checking link status xfrm: Refcount destination entry on xfrm_lookup net: introduce rx_handler results and logic around that bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag bonding: wrap slave state work net: get rid of multiple bond-related netdevice->priv_flags bonding: register slave pointer for rx_handler be2net: Bump up the version number be2net: Copyright notice change. Update to Emulex instead of ServerEngines e1000e: fix kconfig for crc32 dependency netfilter ebtables: fix xt_AUDIT to work with ebtables xen network backend driver bonding: Improve syslog message at device creation time bonding: Call netif_carrier_off after register_netdevice bonding: Incorrect TX queue offset net_sched: fix ip_tos2prio xfrm: fix __xfrm_route_forward() be2net: Fix UDP packet detected status in RX compl Phonet: fix aligned-mode pipe socket buffer header reserve netxen: support for GbE port settings ... Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c with the staging updates.
| * mac80211: make tx() operation return voidJohannes Berg2011-02-251-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The return value of the tx operation is commonly misused by drivers, leading to errors. All drivers will drop frames if they fail to TX the frame, and they must also properly manage the queues (if they didn't, mac80211 would already warn). Removing the ability for drivers to return a BUSY value also allows significant cleanups of the TX TX handling code in mac80211. Note that this also fixes a bug in ath9k_htc, the old "return -1" there was wrong. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Tested-by: Sedat Dilek <sedat.dilek@googlemail.com> [ath5k] Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> [rt2x00] Acked-by: Larry Finger <Larry.Finger@lwfinger.net> [b43, rtl8187, rtlwifi] Acked-by: Luciano Coelho <coelho@ti.com> [wl12xx] Signed-off-by: John W. Linville <linville@tuxdriver.com>
* | staging: winbond: Remove NULL check before kfreeIlia Mirkin2011-03-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was generated by the following semantic patch: // <smpl> @@ expression E; @@ - if (E != NULL) { kfree(E); } + kfree(E); @@ expression E; @@ - if (E != NULL) { kfree(E); E = NULL; } + kfree(E); + E = NULL; // </smpl> Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: winbond: needs <linux/delay.h> for msleep and friendsJeff Mahoney2011-02-281-0/+1
|/ | | | | | | | | | linux/delay.h is pulled in somehow on x86 but not on ia64 or powerpc. This fixes a build failure on those arches since they use [mu]delay. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill struct wb_usbPekka Enberg2010-12-016-32/+13
| | | | | | | | | This patch kills struct wb_usb which now only contains a pointer to struct usb_device. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Remove unused fields from struct wb_usbPekka Enberg2010-12-013-9/+2
| | | | | | | | | | | | This patch removes two unused fields from struct wb_usb: - DetectCount which is always zero - IsUsb20 which is a write-only struct member Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill wblinux_f.h headerPekka Enberg2010-12-013-19/+0
| | | | | | | | | The wblinux_f.h header file doesn't contain anything that's actually used. Kill it. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Merge mlmetxrx.c to mds.cPekka Enberg2010-12-015-82/+38
| | | | | | | | | This patch merges mlmetxrx.c to mds.c because it's small and the functions are only used in mto.c. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill _IBSS_BEACON_SEQ_STICK_Pekka Enberg2010-12-012-8/+0
| | | | | | | | | This patch kills the _IBSS_BEACON_SEQ_STICK_ ifdefs because the macro is never defined. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill write-only ->TxTogglePekka Enberg2010-12-012-9/+0
| | | | | | | | This patch removes ->TxToggle from struct wb35_mds because it's a write only struct member. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill Vendor2 ifdef from hal_init_hardwarePekka Enberg2010-12-011-7/+0
| | | | | | | | | The Vendor2 macro is never defined so remove the ifdef'd block from hal_init_hardware(). Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Remove empty sysdef.h headerPekka Enberg2010-12-019-15/+0
| | | | | | | | The sysdef.h header is empty now so kill it. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Use pr_debug() for debuggingPekka Enberg2010-12-017-99/+26
| | | | | | | | | | | | | Use pr_debug() for debugging printk's and kill the FULL_DEBUG macro. It would be even better to use dev_dbg() but unfortunately looking up struct device in the current code structure makes things very ugly. Please note that I dropped the DataDmp() calls from RFSynthesizer_SwitchingChannel() because that function doesn't exist. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill unused code in mac_structures.hPekka Enberg2010-12-011-499/+0
| | | | | | | | | This patch kills tons of unused macros and struct definitions from mac_structures.h. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill WPA2 definitionsPekka Enberg2010-12-012-48/+0
| | | | | | | | | The _WPA2_ macro is always defined but the data structures that are wrapped by it are never used. Kill them. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill _USE_FALLBACK_RATE_ macroPekka Enberg2010-12-012-6/+0
| | | | | | | | | | | The _USE_FALLBACK_RATE_ macro parametrizes DEFAULT_RATE_RETRY_LIMIT. It's only used in Mxx_initial() in reg.c where _USE_FALLBACK_RATE_ is always defined because the reg.c file includes sysdef.h at the top. It's therefore safe to remove the _USE_FALLBACK_RATE_ macro. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Remove unused defines from sysdef.hPekka Enberg2010-12-011-6/+0
| | | | | | | | This patch removes all the defines in sysdef.h that are not used at all. Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill struct hwdata ->SurpriseRemoveCountPekka Enberg2010-11-091-2/+0
| | | | | | | | | This patch kills the ->SurpriseRemoveCount member of struct hwdata. It's not used at all so it's safe to remove it. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill struct hwdata ->HwStopPekka Enberg2010-11-093-9/+6
| | | | | | | | | This patch kills the ->HwStop member of struct hwdata. It's a read-only variable that's always zero so it's safe to remove it. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill struct hwdata ->NullPacketCountPekka Enberg2010-11-092-15/+0
| | | | | | | | | This patch kills the NullPacketCount member of struct hwdata. It's not used for anything so it's safe to remove it. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Kill empty Mds_Destroy functionPekka Enberg2010-11-093-8/+0
| | | | | | | | The Mds_Destroy() function doesn't do anything so kill it. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Rename wbhal_s.h to wbhal.hPekka Enberg2010-11-0911-10/+10
| | | | | | | | | This patch renames the wbhal_s.h header file to wbhal.h now that it contains both structure and function definitions. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: w35und: Merge wbhal_f.h to wbhal_s.hPekka Enberg2010-11-099-88/+90
| | | | | | | | This patch merges HAL struct and function definitions into one header file. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: winbond: Makefile: replace the use of <module>-objs with <module>-yTracey Dent2010-10-081-1/+1
| | | | | | | Changed <module>-objs to <module>-y in Makefile. Signed-off-by: Tracey Dent <tdent48227@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: winbond: mds.c: Fixed all checkpatch's errorsVictor Rosales2010-09-211-91/+82
| | | | | | | Just fixed all checkpatch's errors but not the warinings. Signed-off-by: Victor Rosales <victorhrosales@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: w35und: Add locking problems to TODO listPekka Enberg2010-09-211-0/+1
| | | | | | | | | | | The w35und uses atomics such as "ThreadCount" and "FireCount" to emulate locking in the TX paths, for example. Document this bug in the TODO list. Cc: Lars Lindley <lindley@coyote.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: w35und: Inline MLMESendFrame() to wbsoft_tx()Pekka Enberg2010-09-213-27/+20
| | | | | | | | | | | The wbsoft_tx() function is a simple wrapper on top of MLMESendFrame() so inline the latter to the former. Cc: Lars Lindley <lindley@coyote.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: w35und: Use NETDEV_TX_BUSY if MLMESendFrame failsPekka Enberg2010-09-213-12/+8
| | | | | | | | | | | | This patch changes MLMESendFrame to return NETDEV_TX_BUSY if MLME frame is in use so that wbsoft_tx() doesn't blindly return NETDEV_TX_OK in that case. Cc: Sandro Bonazzola <sandro.bonazzola@gmail.com> Cc: Lars Lindley <lindley@coyote.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: w35und: Remove unused fields from struct wbsoft_privPekka Enberg2010-09-211-7/+0
| | | | | | | | | | This patch removes unused fields from "struct wbsoft_priv". Cc: Lars Lindley <lindley@coyote.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: w35und: Remove unused spinlocksPekka Enberg2010-09-212-7/+0
| | | | | | | | | | | This patch removes unused spinlocks from "struct mlme_frame" and "struct wbsoft_priv". Cc: Lars Lindley <lindley@coyote.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: w35und: Inline mlme_s.h to core.hPekka Enberg2010-09-212-45/+34
| | | | | | | | | | | The mlme_s.h header is included in one place. As the header is very small, just inline it to core.h. Cc: Lars Lindley <lindley@coyote.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: w35und: Remove dead code from mlme_s.hPekka Enberg2010-09-211-116/+0
| | | | | | | | | | | There's bunch of macros in mlme_s.h that aren't used for anything. Kill them off. Cc: Lars Lindley <lindley@coyote.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: w35und: Kill unused scan_s.h headerPekka Enberg2010-09-212-58/+0
| | | | | | | | | | The scan_s.h header is not actually used for anything so just kill it off. Cc: Lars Lindley <lindley@coyote.org> Cc: Pavel Machek <pavel@ucw.cz> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: w35und: Remove remaining typedef declarationsPekka Enberg2010-09-2111-146/+41
| | | | | | | | | | | This patch removes remaining typedef declarations from the w35und driver. Most of them were unused so I just killed them off completely. Cc: Lars Lindley <lindley@coyote.org> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging: w35und: Kill dead HAL macros in wbhal_f.hPekka Enberg2010-09-212-30/+0
| | | | | | | | | | | | | | Fixes an uninitialized variable access in _rx_iq_calibration_loop_winbond(): CC [M] drivers/staging/winbond/phy_calibration.o drivers/staging/winbond/phy_calibration.c: In function ‘_rx_iq_calibration_loop_winbond’: drivers/staging/winbond/phy_calibration.c:1138: warning: ‘val’ is used uninitialized in this function Cc: Lars Lindley <lindley@coyote.org> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: Ruslan Pisarev <ruslan@rpisarev.org.ua> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Merge staging-next into Linus's treeGreg Kroah-Hartman2010-08-054-583/+433
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/staging/Kconfig drivers/staging/batman-adv/bat_sysfs.c drivers/staging/batman-adv/device.c drivers/staging/batman-adv/hard-interface.c drivers/staging/cx25821/cx25821-audups11.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: fix typos concerning "address"Uwe Kleine-König2010-07-221-1/+1
| | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: winbond: use ARRAY_SIZEKulikov Vasiliy2010-07-081-18/+18
| | | | | | | | | | | | | | | | Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x). Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: winbond: fix build errorsGreg Kroah-Hartman2010-06-181-3/+2
| | | | | | | | | | | | | | | | Some errors crept in due to a previous patch that I missed. This fixes them up so the driver continues to build, sorry about that. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: winbond: fix some checkpatch.pl issues in phy_calibration.cTimofey Trofimov2010-06-181-490/+345
| | | | | | | | | | | | | | | | | | This is a patch to the phy_calibration.c that fixes up almost all warnings and errors (except 80 characters limit and lack of tabs errors) found by the checkpatch.pl tool Signed-off-by: Timofey Trofimov <tumoxep@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: winbond: Fix for brace style, length and whitespace in mac_structures.hAdam Latham2010-06-181-63/+59
| | | | | | | | | | | | | | | | This patch fixes line length, brace style and whitespace issues in the mac_structures.h file found by the checkpatch.pl tool Signed-off-by: Adam Latham <adam.latham@unisontorbay.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * Staging: winbond: Fix C99 Comment issues in mac_structures.hAdam Latham2010-06-181-11/+11
| | | | | | | | | | | | | | | | | | This patch fixes the use of //C99 comments in the mac_structures.h found by the checkpatch.pl tool Signed-off-by: Adam Latham <adam.latham@unisontorbay.org.uk> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | update email addressPavel Machek2010-07-191-1/+1
|/ | | | | | | pavel@suse.cz no longer works, replace it with working address. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* Merge staging-next tree into Linus's latest versionGreg Kroah-Hartman2010-05-2128-4667/+4134
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/staging/arlan/arlan-main.c drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/cx25821/cx25821-alsa.c drivers/staging/dt3155/dt3155_drv.c drivers/staging/hv/hv.c drivers/staging/netwave/netwave_cs.c drivers/staging/wavelan/wavelan.c drivers/staging/wavelan/wavelan_cs.c drivers/staging/wlags49_h2/wl_cs.c This required a bit of hand merging due to the conflicts that happened in the later .34-rc releases, as well as some staging driver changing coming in through other trees (v4l and pcmcia). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>