diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 19:20:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 19:20:37 -0400 |
| commit | 42fae7fb1c27d230fbd48aa055a4ae6796fb0039 (patch) | |
| tree | 94836c3535cf7e972cdc2ea65598fa2182b20fa3 /include | |
| parent | f00546363fff1576ceddc2690d47e5f9c1dd2e05 (diff) | |
| parent | b8b8fd2dc23725fba77f66b3fef11b11f983fc08 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Fix networking compilation errors
[AF_RXRPC/AFS]: Arch-specific fixes.
[AFS]: Fix VLocation record update wakeup
[NET]: Revert sk_buff walker cleanups.
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/wext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/wext.h b/include/net/wext.h index 55741836a675..c02b8decf3af 100644 --- a/include/net/wext.h +++ b/include/net/wext.h | |||
| @@ -10,7 +10,7 @@ extern int wext_proc_init(void); | |||
| 10 | extern int wext_handle_ioctl(struct ifreq *ifr, unsigned int cmd, | 10 | extern int wext_handle_ioctl(struct ifreq *ifr, unsigned int cmd, |
| 11 | void __user *arg); | 11 | void __user *arg); |
| 12 | #else | 12 | #else |
| 13 | static inline int wext_proc_init() | 13 | static inline int wext_proc_init(void) |
| 14 | { | 14 | { |
| 15 | return 0; | 15 | return 0; |
| 16 | } | 16 | } |