diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-09-11 12:38:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-09-11 12:38:45 +0200 |
| commit | 3d0049e8529adaa36c38a7b400792f6c37b66c92 (patch) | |
| tree | 7d2e30a5e3f12207305ffc76d80d310c0a95fdcc /net/ipv4/xfrm4_state.c | |
| parent | be8cf44526d8972c2dbf6e561162dad924a712a5 (diff) | |
| parent | 2ae2caff8348378c9e464353e9860ee97583c00b (diff) | |
Merge tag 'asoc-v3.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A few small fixes, nothing with any broad impact but all useful for the
affected systems. The Kirkwood compatible string change is fixing up a
string just added in the merge window so that we don't get any changes
in released kernels.
Diffstat (limited to 'net/ipv4/xfrm4_state.c')
| -rw-r--r-- | net/ipv4/xfrm4_state.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c index 9258e751bab..0b2a0641526 100644 --- a/net/ipv4/xfrm4_state.c +++ b/net/ipv4/xfrm4_state.c @@ -83,6 +83,7 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = { .extract_input = xfrm4_extract_input, .extract_output = xfrm4_extract_output, .transport_finish = xfrm4_transport_finish, + .local_error = xfrm4_local_error, }; void __init xfrm4_state_init(void) |