From b16a228d05a95b27d77d07a91688382f68ece8a7 Mon Sep 17 00:00:00 2001 From: "simon@thekelleys.org.uk" Date: Sun, 30 Oct 2005 15:50:15 +0000 Subject: [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 --- drivers/net/wireless/atmel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net/wireless/atmel.h') diff --git a/drivers/net/wireless/atmel.h b/drivers/net/wireless/atmel.h index 825000edfc2..b9b3e5b7654 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 -- cgit v1.2.3