diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-12-19 06:22:11 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-12-19 06:22:11 -0500 |
| commit | 356f402da0f989b16e4b6849e88dba5df0e25944 (patch) | |
| tree | d1d41d07abf30bdd7fe1498f6eb239eaced6d9b3 /net/sched/act_pedit.c | |
| parent | 3a6c5d8ad0a9253aafb76df3577edcb68c09b939 (diff) | |
| parent | 96b7fe0119b932ad25451d2b6357e727bbe6a309 (diff) | |
Merge tag 'asoc-v3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13
The fixes here are all driver specific ones, none of which particularly
stand out but all of which are useful to users of those drivers.
Diffstat (limited to 'net/sched/act_pedit.c')
| -rw-r--r-- | net/sched/act_pedit.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c index 7ed78c9e505c..03b67674169c 100644 --- a/net/sched/act_pedit.c +++ b/net/sched/act_pedit.c | |||
| @@ -243,9 +243,7 @@ static struct tc_action_ops act_pedit_ops = { | |||
| 243 | .act = tcf_pedit, | 243 | .act = tcf_pedit, |
| 244 | .dump = tcf_pedit_dump, | 244 | .dump = tcf_pedit_dump, |
| 245 | .cleanup = tcf_pedit_cleanup, | 245 | .cleanup = tcf_pedit_cleanup, |
| 246 | .lookup = tcf_hash_search, | ||
| 247 | .init = tcf_pedit_init, | 246 | .init = tcf_pedit_init, |
| 248 | .walk = tcf_generic_walker | ||
| 249 | }; | 247 | }; |
| 250 | 248 | ||
| 251 | MODULE_AUTHOR("Jamal Hadi Salim(2002-4)"); | 249 | MODULE_AUTHOR("Jamal Hadi Salim(2002-4)"); |
