Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/s2io.c
This commit is contained in:
@ -58,7 +58,7 @@ struct lapbethdev {
|
||||
struct net_device_stats stats; /* some statistics */
|
||||
};
|
||||
|
||||
static struct list_head lapbeth_devices = LIST_HEAD_INIT(lapbeth_devices);
|
||||
static LIST_HEAD(lapbeth_devices);
|
||||
|
||||
/* ------------------------------------------------------------------------ */
|
||||
|
||||
|
Reference in New Issue
Block a user