diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-02 15:46:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-02 15:46:37 -0500 |
| commit | 09f921f83faa49cdea25abfb98c439c01526b89d (patch) | |
| tree | 1e8ee5c8f14e0e57965eca81bc6725288fd3597b /drivers/net/wireless/orinoco/scan.h | |
| parent | 4cebb34caa5122216a1e2451eae9e0fc47ec2589 (diff) | |
| parent | d89197c7f34934fbb0f96d938a0d6cfe0b8bcb1c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Diffstat (limited to 'drivers/net/wireless/orinoco/scan.h')
| -rw-r--r-- | drivers/net/wireless/orinoco/scan.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/orinoco/scan.h b/drivers/net/wireless/orinoco/scan.h index 2dc4e046dbdb..27281fb0a6dc 100644 --- a/drivers/net/wireless/orinoco/scan.h +++ b/drivers/net/wireless/orinoco/scan.h @@ -16,5 +16,6 @@ void orinoco_add_extscan_result(struct orinoco_private *priv, void orinoco_add_hostscan_results(struct orinoco_private *dev, unsigned char *buf, size_t len); +void orinoco_scan_done(struct orinoco_private *priv, bool abort); #endif /* _ORINOCO_SCAN_H_ */ |