diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-06-19 20:39:28 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-19 20:39:28 +0300 |
| commit | d4e0045c4ed300781d2d4cbab57d05ed5e665a37 (patch) | |
| tree | 925bab41d7906329392aa12c8fa7bcc70f64ca46 /include/linux/sysctl.h | |
| parent | 2d7b56378d32b0cf006f8944cbba4046df45dd25 (diff) | |
| parent | 41f1830f5a7af77cf5c86359aba3cbd706687e52 (diff) | |
| download | linux-d4e0045c4ed300781d2d4cbab57d05ed5e665a37.tar.xz | |
Merge remote-tracking branch 'origin/master' into drm-misc-next-fixes
Backmerge 4.12-rc6 into -next-fixes. -next-fixes will contain find patches
for 4.13 merge window
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index b7e82049fec7..80d07816def0 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -180,7 +180,6 @@ extern void setup_sysctl_set(struct ctl_table_set *p, int (*is_seen)(struct ctl_table_set *)); extern void retire_sysctl_set(struct ctl_table_set *set); -void register_sysctl_root(struct ctl_table_root *root); struct ctl_table_header *__register_sysctl_table( struct ctl_table_set *set, const char *path, struct ctl_table *table); |