diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 23:12:42 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 23:13:05 +0100 |
| commit | 972c5ae961d6e5103e2b33d935cfa4145fd47140 (patch) | |
| tree | 350b2a76b979ba8766c09838617df67ff330eca0 /fs/proc/internal.h | |
| parent | 5196d20305d5e30d871111d3a876cf067dd94255 (diff) | |
| parent | 7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f (diff) | |
| download | linux-972c5ae961d6e5103e2b33d935cfa4145fd47140.tar.bz2 | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)
Diffstat (limited to 'fs/proc/internal.h')
| -rw-r--r-- | fs/proc/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 7838e5cfec14..292577531ad1 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -117,6 +117,7 @@ void pde_put(struct proc_dir_entry *pde); int proc_fill_super(struct super_block *); struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *); +int proc_remount(struct super_block *sb, int *flags, char *data); /* * These are generic /proc routines that use the internal |