Merge branches 'acpi-pm', 'acpi-processor' and 'acpi-video'

[karo-tx-linux.git] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 57a9be9a66680db82b3f54e8055bf4f0d2c5c906..8420a2f80811821c046b7ce069416dd291ea6349 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -66,8 +66,7 @@ static struct inode *proc_alloc_inode(struct super_block *sb)
        ei->pde = NULL;
        ei->sysctl = NULL;
        ei->sysctl_entry = NULL;
-       ei->ns.ns = NULL;
-       ei->ns.ns_ops = NULL;
+       ei->ns_ops = NULL;
        inode = &ei->vfs_inode;
        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
        return inode;