Merge branches 'pm-cpufreq-fixes' and 'pm-sleep-fixes'

[linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 976f7324887b3b3203fe972447047c1ed805ee2b..5a9bf5ee2464da20fbb42ea6699b29318553e210 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -519,7 +519,6 @@ static ssize_t sockfs_listxattr(struct dentry *dentry, char *buffer,
 }
 
 static const struct inode_operations sockfs_inode_ops = {
-       .getxattr = generic_getxattr,
        .listxattr = sockfs_listxattr,
 };