diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
| commit | 255333c1db3ec63921de29b134418a4e56e5921e (patch) | |
| tree | b1cd99373cabfa6fed020496d4d74500e7bc7e92 /drivers/net/mv643xx_eth.c | |
| parent | 9a43b709a230705ca40a6f854a334a02334a3c1c (diff) | |
| parent | 0d66afe7805b169b6bf3c7a88cf8163298b8ef05 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/rc80211_pid_algo.c
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index b528ce77c406..771139e283af 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
| @@ -2104,6 +2104,7 @@ MODULE_LICENSE("GPL"); | |||
| 2104 | MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani" | 2104 | MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani" |
| 2105 | " and Dale Farnsworth"); | 2105 | " and Dale Farnsworth"); |
| 2106 | MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX"); | 2106 | MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX"); |
| 2107 | MODULE_ALIAS("platform:mv643xx_eth"); | ||
| 2107 | 2108 | ||
| 2108 | /* | 2109 | /* |
| 2109 | * The second part is the low level driver of the gigE ethernet ports. | 2110 | * The second part is the low level driver of the gigE ethernet ports. |