diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /drivers/net/pci-skeleton.c | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
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 | ||