diff --git a/[refs] b/[refs] index 0ded27b29e0b..123fdfb3a21b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bd43f2c31848d751f63e8753cd2788d48fb5f30 +refs/heads/master: 8c056e5b148498192832678cf2957760945e8c71 diff --git a/trunk/fs/devpts/inode.c b/trunk/fs/devpts/inode.c index b02c24313d5c..3f309f181de8 100644 --- a/trunk/fs/devpts/inode.c +++ b/trunk/fs/devpts/inode.c @@ -320,6 +320,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent) return -ENOMEM; } +#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES static int compare_init_pts_sb(struct super_block *s, void *p) { if (devpts_mnt) @@ -327,7 +328,6 @@ static int compare_init_pts_sb(struct super_block *s, void *p) return 0; } -#ifdef CONFIG_DEVPTS_MULTIPLE_INSTANCES /* * Safely parse the mount options in @data and update @opts. *