Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/Kconfig
This commit is contained in:
David S. Miller 2009-02-03 00:15:35 -08:00
commit b3ff29d2cc
583 changed files with 14384 additions and 6099 deletions

View file

@ -2,6 +2,7 @@
#define _LINUX_VIRTIO_NET_H
/* This header is BSD licensed so anyone can use the definitions to implement
* compatible drivers/servers. */
#include <linux/types.h>
#include <linux/virtio_config.h>
/* The ID for virtio_net */