diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/misc/ibmasm/ibmasmfs.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/misc/ibmasm/ibmasmfs.c')
-rw-r--r-- | drivers/misc/ibmasm/ibmasmfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c index 5c550fcac2c4..26a230b6ff80 100644 --- a/drivers/misc/ibmasm/ibmasmfs.c +++ b/drivers/misc/ibmasm/ibmasmfs.c | |||
@@ -101,7 +101,7 @@ static struct super_operations ibmasmfs_s_ops = { | |||
101 | .drop_inode = generic_delete_inode, | 101 | .drop_inode = generic_delete_inode, |
102 | }; | 102 | }; |
103 | 103 | ||
104 | static struct file_operations *ibmasmfs_dir_ops = &simple_dir_operations; | 104 | static const struct file_operations *ibmasmfs_dir_ops = &simple_dir_operations; |
105 | 105 | ||
106 | static struct file_system_type ibmasmfs_type = { | 106 | static struct file_system_type ibmasmfs_type = { |
107 | .owner = THIS_MODULE, | 107 | .owner = THIS_MODULE, |