diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-14 15:29:18 -0400 |
| commit | ebe8912be214662c8289977fb416c1f015df4a0b (patch) | |
| tree | cb82c552c602e5ae1a4bd8c11bd171bf88a58c35 /drivers/net/mv643xx_eth.c | |
| parent | 50531444fac593c8c8e3ff2e41944d9507bb4665 (diff) | |
| parent | dba92d3bc49c036056a48661d2d8fefe4c78375a (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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. |