diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-22 15:14:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-22 15:14:13 +1000 |
| commit | 6ffef501f6b9990d4d34f0d32c5b2c7a9d659b89 (patch) | |
| tree | 6b8f93de1c67557a33e1e337cdf645b8442241e4 /drivers/net | |
| parent | 4699372cdb4cc6c597b2c1e49a6e5a327d1476b1 (diff) | |
| parent | c2569a243675475a533bc701942468cd42f4b7f9 (diff) | |
Merge commit 'x86-latest/latest'
Conflicts:
arch/x86/pci/acpi.c
arch/x86/pci/common.c
arch/x86/pci/pci.h
include/asm-powerpc/bitops.h
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/xen-netfront.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 7483d45bc5bc..e62018a36133 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1809,3 +1809,5 @@ module_exit(netif_exit); MODULE_DESCRIPTION("Xen virtual network device frontend"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("xen:vif"); +MODULE_ALIAS("xennet"); |