diff options
| author | simon@thekelleys.org.uk <simon@thekelleys.org.uk> | 2005-10-30 15:50:15 +0000 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 08:12:17 -0500 |
| commit | b16a228d05a95b27d77d07a91688382f68ece8a7 (patch) | |
| tree | a76708ef80110839f6f8cc88da292962548d51f5 /drivers/net/wireless/atmel.h | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
| download | blackbird-obmc-linux-b16a228d05a95b27d77d07a91688382f68ece8a7.tar.gz blackbird-obmc-linux-b16a228d05a95b27d77d07a91688382f68ece8a7.zip | |
[PATCH] Atmel wireless update
* Merge PCMCIA card table with new Brodowski PCMCIA id table.
* Add missing entries to PCMCIA id table.
* Other tweaks to conform with Documentation/driver-changes.txt
(types, call request_region, etc)
* Fix size of requested IO region.
* Reduce printk verbosity.
* Remove EXPERIMENTAL
* tweak to association code - don't force shared key authentication
when wep in use.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/wireless/atmel.h')
| -rw-r--r-- | drivers/net/wireless/atmel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/atmel.h b/drivers/net/wireless/atmel.h index 825000edfc2c..b9b3e5b76544 100644 --- a/drivers/net/wireless/atmel.h +++ b/drivers/net/wireless/atmel.h @@ -35,9 +35,9 @@ typedef enum { ATMEL_FW_TYPE_506 } AtmelFWType; -struct net_device *init_atmel_card(unsigned short, int, const AtmelFWType, struct device *, +struct net_device *init_atmel_card(unsigned short, unsigned long, const AtmelFWType, struct device *, int (*present_func)(void *), void * ); -void stop_atmel_card( struct net_device *, int ); +void stop_atmel_card( struct net_device *); int atmel_open( struct net_device * ); #endif |
