diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 13:32:29 -0400 |
| commit | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (patch) | |
| tree | b8cc69814d2368b08d0a84c8da0c12028bd04867 /include/net/xfrm.h | |
| parent | 39fbe47377062200acc26ea0ccef223b4399a82c (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
Merge HEAD from /spare/repo/linux-2.6/.git
Diffstat (limited to 'include/net/xfrm.h')
| -rw-r--r-- | include/net/xfrm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 868ef88ef971..a9d0d8c5dfbf 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
| @@ -818,7 +818,6 @@ extern void xfrm6_init(void); | |||
| 818 | extern void xfrm6_fini(void); | 818 | extern void xfrm6_fini(void); |
| 819 | extern void xfrm_state_init(void); | 819 | extern void xfrm_state_init(void); |
| 820 | extern void xfrm4_state_init(void); | 820 | extern void xfrm4_state_init(void); |
| 821 | extern void xfrm4_state_fini(void); | ||
| 822 | extern void xfrm6_state_init(void); | 821 | extern void xfrm6_state_init(void); |
| 823 | extern void xfrm6_state_fini(void); | 822 | extern void xfrm6_state_fini(void); |
| 824 | 823 | ||