diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-02-16 15:47:43 -0500 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-02-16 15:47:43 -0500 |
| commit | d4da404f36b24b089d20db1fb27d8f99cb66f409 (patch) | |
| tree | 349c4b792281826652eb9e6d7a46ed6622dc90de /include/linux/sysctl.h | |
| parent | fa4127c5eb8def998fd8a471d51a4f2560dea0a2 (diff) | |
| parent | 933519a5a269d8460450545adefcb5caec622cac (diff) | |
Merge airlied/drm-next into drm-misc-next
Backmerge 4.15 and hdcp topic branch
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 992bc9948232..b769ecfcc3bd 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -51,9 +51,6 @@ extern int proc_dointvec_minmax(struct ctl_table *, int, extern int proc_douintvec_minmax(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); -extern int proc_dopipe_max_size(struct ctl_table *table, int write, - void __user *buffer, size_t *lenp, - loff_t *ppos); extern int proc_dointvec_jiffies(struct ctl_table *, int, void __user *, size_t *, loff_t *); extern int proc_dointvec_userhz_jiffies(struct ctl_table *, int, |