diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/net/pci-skeleton.c | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/net/pci-skeleton.c')
| -rw-r--r-- | drivers/net/pci-skeleton.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 1766dc4f07e1..c0f23376a462 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
| @@ -214,7 +214,7 @@ static struct { | |||
| 214 | { "SMC1211TX EZCard 10/100 (RealTek RTL8139)" }, | 214 | { "SMC1211TX EZCard 10/100 (RealTek RTL8139)" }, |
| 215 | /* { MPX5030, "Accton MPX5030 (RealTek RTL8139)" },*/ | 215 | /* { MPX5030, "Accton MPX5030 (RealTek RTL8139)" },*/ |
| 216 | { "Delta Electronics 8139 10/100BaseTX" }, | 216 | { "Delta Electronics 8139 10/100BaseTX" }, |
| 217 | { "Addtron Technolgy 8139 10/100BaseTX" }, | 217 | { "Addtron Technology 8139 10/100BaseTX" }, |
| 218 | }; | 218 | }; |
| 219 | 219 | ||
| 220 | 220 | ||