diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-24 22:31:46 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-24 22:31:46 -0400 |
| commit | 16fddf5457d2a7eb5e96ceb016a8f722eca97af6 (patch) | |
| tree | ae3083a50c55f1e1a2c83f475d0e8bb2da8d7196 /include/net | |
| parent | 5492a7e4cba8e38419d489f0865de0a67c737e8a (diff) | |
| parent | cc7feea39bed2951cc29af3ad642f39a99dfe8d3 (diff) | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sctp/sctp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 57ed3e323d97..ea806732b084 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
| @@ -389,7 +389,7 @@ void sctp_v6_del_protocol(void); | |||
| 389 | 389 | ||
| 390 | #else /* #ifdef defined(CONFIG_IPV6) */ | 390 | #else /* #ifdef defined(CONFIG_IPV6) */ |
| 391 | 391 | ||
| 392 | static inline void sctp_v6_pf_init(void) { return 0; } | 392 | static inline void sctp_v6_pf_init(void) { return; } |
| 393 | static inline void sctp_v6_pf_exit(void) { return; } | 393 | static inline void sctp_v6_pf_exit(void) { return; } |
| 394 | static inline int sctp_v6_protosw_init(void) { return 0; } | 394 | static inline int sctp_v6_protosw_init(void) { return 0; } |
| 395 | static inline void sctp_v6_protosw_exit(void) { return; } | 395 | static inline void sctp_v6_protosw_exit(void) { return; } |