Merge ../linux-2.6

This commit is contained in:
Paul Mackerras
2006-03-29 13:24:50 +11:00
779 changed files with 23033 additions and 7810 deletions

View File

@@ -103,7 +103,7 @@ spufs_setattr(struct dentry *dentry, struct iattr *attr)
static int
spufs_new_file(struct super_block *sb, struct dentry *dentry,
struct file_operations *fops, int mode,
const struct file_operations *fops, int mode,
struct spu_context *ctx)
{
static struct inode_operations spufs_file_iops = {