diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-16 02:16:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-16 02:16:31 -0700 |
| commit | 32686b9d8bc6001d7365caa517adef393548021d (patch) | |
| tree | 25a15541e1d05b5109808301fe175c3a70aabb58 /include/linux | |
| parent | 532de20cdce829c1af0f53eb01389005f2bc5966 (diff) | |
| parent | fc252a2b4ef0ba7783511f7cb1d532f75d08f03e (diff) | |
Merge bk://gkernel.bkbits.net/net-drivers-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5c5a551fe630..6a821e7dbb03 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -42,13 +42,14 @@ struct divert_blk; struct vlan_group; struct ethtool_ops; - /* source back-compat hook */ + /* source back-compat hooks */ #define SET_ETHTOOL_OPS(netdev,ops) \ ( (netdev)->ethtool_ops = (ops) ) #define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev functions are available. */ -#define HAVE_FREE_NETDEV +#define HAVE_FREE_NETDEV /* free_netdev() */ +#define HAVE_NETDEV_PRIV /* netdev_priv() */ #define NET_XMIT_SUCCESS 0 #define NET_XMIT_DROP 1 /* skb dropped */ |