diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-06 18:05:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-06 18:05:43 -0700 |
| commit | 3989203290fba6fdf6bc4825fbf6526e1bf17977 (patch) | |
| tree | 2fb2012e6136d3b8acbf10eaee6dce95afc6f781 /net/802/fddi.c | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
| parent | 37efa239901493694a48f1d6f59f8de17c2c4509 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
b44: Use kernel DMA addresses for the kernel DMA API
forcedeth: Fix resume from hibernation regression.
xfrm: fix fragmentation on inter family tunnels
ibm_newemac: Fix dangerous struct assumption
gigaset: documentation update
gigaset: in file ops, check for device disconnect before anything else
bas_gigaset: use tasklet_hi_schedule for timing critical tasklets
net/802/fddi.c: add MODULE_LICENSE
smsc911x: remove unused #include <linux/version.h>
axnet_cs: fix phy_id detection for bogus Asix chip.
bnx2: Use request_firmware()
b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}()
socket: use percpu_add() while updating sockets_in_use
virtio_net: Set the mac config only when VIRITO_NET_F_MAC
myri_sbus: use request_firmware
e1000: fix loss of multicast packets
vxge: should include tcp.h
Conflict in firmware/WHENCE (SCSI vs net firmware)
Diffstat (limited to 'net/802/fddi.c')
| -rw-r--r-- | net/802/fddi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/802/fddi.c b/net/802/fddi.c index f1611a1e06a..539e6064e6d 100644 --- a/net/802/fddi.c +++ b/net/802/fddi.c @@ -215,3 +215,5 @@ struct net_device *alloc_fddidev(int sizeof_priv) return alloc_netdev(sizeof_priv, "fddi%d", fddi_setup); } EXPORT_SYMBOL(alloc_fddidev); + +MODULE_LICENSE("GPL"); |