diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-05 14:57:46 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-01-05 14:57:46 +1100 |
| commit | 57bb8587a072c8f76d8f1b1807a78add5ce0f292 (patch) | |
| tree | dd0abb5a545cd4f2c4ff3fdf2449f2d413d058b9 /drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | |
| parent | fe852b0df2ff1e5980e23b71bb08edd55e2b517e (diff) | |
| parent | 4453f4fde106d53de1d8532684871b47fc735ec6 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c index acc231293e4d..f6e739da7bb7 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c @@ -1416,7 +1416,7 @@ static unsigned int xdigit2int(unsigned char c) * <pattern data>[/<pattern mask>][@<anchor>] * * Up to 2 filter patterns can be specified. If 2 are supplied the first one - * must be anchored at 0. An omited mask is taken as a mask of 1s, an omitted + * must be anchored at 0. An omitted mask is taken as a mask of 1s, an omitted * anchor is taken as 0. */ static ssize_t mps_trc_write(struct file *file, const char __user *buf, |