diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 05:06:47 -0500 |
| commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
| tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /net/802 | |
| parent | 2c3c3d02f28801d7ad2da4952b2c7ca6621ef221 (diff) | |
| parent | 72e2240f181871675d3a979766330c91d48a1673 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
Diffstat (limited to 'net/802')
| -rw-r--r-- | net/802/tr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/802/tr.c b/net/802/tr.c index dab6334b6258..e7eb13084d71 100644 --- a/net/802/tr.c +++ b/net/802/tr.c | |||
| @@ -670,3 +670,5 @@ module_init(rif_init); | |||
| 670 | 670 | ||
| 671 | EXPORT_SYMBOL(tr_type_trans); | 671 | EXPORT_SYMBOL(tr_type_trans); |
| 672 | EXPORT_SYMBOL(alloc_trdev); | 672 | EXPORT_SYMBOL(alloc_trdev); |
| 673 | |||
| 674 | MODULE_LICENSE("GPL"); | ||