diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 11:46:08 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 11:46:08 +1000 |
| commit | dffb1f0350afecec2f855771d9fe0e27705fbfe6 (patch) | |
| tree | 159439916c71e241d13b539af55d0142ec95d0ca /drivers/net/ll_temac_main.c | |
| parent | 4815007bc6123253f9d89f43334557a4a05680ec (diff) | |
| parent | a7ce2e0d04b1a6ee8056e7fea5ea96566d33a6f4 (diff) | |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'drivers/net/ll_temac_main.c')
| -rw-r--r-- | drivers/net/ll_temac_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index b5c6279cc5a3..4eea3f70c5cf 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c @@ -497,7 +497,7 @@ static u32 temac_setoptions(struct net_device *ndev, u32 options) return (0); } -/* Initilize temac */ +/* Initialize temac */ static void temac_device_reset(struct net_device *ndev) { struct temac_local *lp = netdev_priv(ndev); |