diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/net/wireless/atmel.h | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
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 { | |||
| 35 | ATMEL_FW_TYPE_506 | 35 | ATMEL_FW_TYPE_506 |
| 36 | } AtmelFWType; | 36 | } AtmelFWType; |
| 37 | 37 | ||
| 38 | struct net_device *init_atmel_card(unsigned short, int, const AtmelFWType, struct device *, | 38 | struct net_device *init_atmel_card(unsigned short, unsigned long, const AtmelFWType, struct device *, |
| 39 | int (*present_func)(void *), void * ); | 39 | int (*present_func)(void *), void * ); |
| 40 | void stop_atmel_card( struct net_device *, int ); | 40 | void stop_atmel_card( struct net_device *); |
| 41 | int atmel_open( struct net_device * ); | 41 | int atmel_open( struct net_device * ); |
| 42 | 42 | ||
| 43 | #endif | 43 | #endif |