git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
via-velocity.h
diff --git
a/drivers/net/via-velocity.h
b/drivers/net/via-velocity.h
index
1b70b7c
..
d9a774b
100644
(file)
--- 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
* the rest of the logic from the result of sleep/wakeup
*/
* the rest of the logic from the result of sleep/wakeup
*/
-
inline static
void mac_wol_reset(struct mac_regs __iomem * regs)
+
static inline
void mac_wol_reset(struct mac_regs __iomem * regs)
{
/* Turn off SWPTAG right after leaving power mode */
{
/* Turn off SWPTAG right after leaving power mode */
@@
-1811,7
+1811,7
@@
struct velocity_info {
* CHECK ME: locking
*/
* CHECK ME: locking
*/
-
inline static
int velocity_get_ip(struct velocity_info *vptr)
+
static inline
int velocity_get_ip(struct velocity_info *vptr)
{
struct in_device *in_dev = (struct in_device *) vptr->dev->ip_ptr;
struct in_ifaddr *ifa;
{
struct in_device *in_dev = (struct in_device *) vptr->dev->ip_ptr;
struct in_ifaddr *ifa;