diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ioctl32.h | 17 | ||||
-rw-r--r-- | include/net/sock.h | 9 |
2 files changed, 0 insertions, 26 deletions
diff --git a/include/linux/ioctl32.h b/include/linux/ioctl32.h deleted file mode 100644 index 948809d999..0000000000 --- a/include/linux/ioctl32.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #ifndef IOCTL32_H | ||
2 | #define IOCTL32_H 1 | ||
3 | |||
4 | #include <linux/compiler.h> /* for __deprecated */ | ||
5 | |||
6 | struct file; | ||
7 | |||
8 | typedef int (*ioctl_trans_handler_t)(unsigned int, unsigned int, | ||
9 | unsigned long, struct file *); | ||
10 | |||
11 | struct ioctl_trans { | ||
12 | unsigned long cmd; | ||
13 | ioctl_trans_handler_t handler; | ||
14 | struct ioctl_trans *next; | ||
15 | }; | ||
16 | |||
17 | #endif | ||
diff --git a/include/net/sock.h b/include/net/sock.h index 25c37e34bf..689b886038 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -1361,15 +1361,6 @@ static inline void sock_valbool_flag(struct sock *sk, int bit, int valbool) | |||
1361 | extern __u32 sysctl_wmem_max; | 1361 | extern __u32 sysctl_wmem_max; |
1362 | extern __u32 sysctl_rmem_max; | 1362 | extern __u32 sysctl_rmem_max; |
1363 | 1363 | ||
1364 | #ifdef CONFIG_NET | ||
1365 | int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg); | ||
1366 | #else | ||
1367 | static inline int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) | ||
1368 | { | ||
1369 | return -ENODEV; | ||
1370 | } | ||
1371 | #endif | ||
1372 | |||
1373 | extern void sk_init(void); | 1364 | extern void sk_init(void); |
1374 | 1365 | ||
1375 | #ifdef CONFIG_SYSCTL | 1366 | #ifdef CONFIG_SYSCTL |