diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/net/via-velocity.h | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/net/via-velocity.h')
| -rw-r--r-- | drivers/net/via-velocity.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h index 1b70b7c97580..d9a774b91ddc 100644 --- a/drivers/net/via-velocity.h +++ b/drivers/net/via-velocity.h | |||
| @@ -1414,7 +1414,7 @@ static inline void mac_get_cam(struct mac_regs __iomem * regs, int idx, u8 *addr | |||
| 1414 | * the rest of the logic from the result of sleep/wakeup | 1414 | * the rest of the logic from the result of sleep/wakeup |
| 1415 | */ | 1415 | */ |
| 1416 | 1416 | ||
| 1417 | inline static void mac_wol_reset(struct mac_regs __iomem * regs) | 1417 | static inline void mac_wol_reset(struct mac_regs __iomem * regs) |
| 1418 | { | 1418 | { |
| 1419 | 1419 | ||
| 1420 | /* Turn off SWPTAG right after leaving power mode */ | 1420 | /* Turn off SWPTAG right after leaving power mode */ |
| @@ -1811,7 +1811,7 @@ struct velocity_info { | |||
| 1811 | * CHECK ME: locking | 1811 | * CHECK ME: locking |
| 1812 | */ | 1812 | */ |
| 1813 | 1813 | ||
| 1814 | inline static int velocity_get_ip(struct velocity_info *vptr) | 1814 | static inline int velocity_get_ip(struct velocity_info *vptr) |
| 1815 | { | 1815 | { |
| 1816 | struct in_device *in_dev = (struct in_device *) vptr->dev->ip_ptr; | 1816 | struct in_device *in_dev = (struct in_device *) vptr->dev->ip_ptr; |
| 1817 | struct in_ifaddr *ifa; | 1817 | struct in_ifaddr *ifa; |