diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 08:14:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 08:14:56 -0500 |
| commit | 2ecc26b87a2b3e8650d3c7fe3fc85a8c73d5560d (patch) | |
| tree | 0453e556241830d675d2063b74ac3b769326b379 /drivers/net/wireless/atmel.h | |
| parent | 6af37fa9928a0d50cda1bad14b2eda8c1a4d1a0e (diff) | |
| parent | b16a228d05a95b27d77d07a91688382f68ece8a7 (diff) | |
Merge branch 'atmel'
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 |