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 /fs/openpromfs/inode.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'fs/openpromfs/inode.c')
-rw-r--r-- | fs/openpromfs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index aeb0106890e4..0f14276a2e51 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c | |||
@@ -581,17 +581,17 @@ int property_release (struct inode *inode, struct file *filp) | |||
581 | return 0; | 581 | return 0; |
582 | } | 582 | } |
583 | 583 | ||
584 | static struct file_operations openpromfs_prop_ops = { | 584 | static const struct file_operations openpromfs_prop_ops = { |
585 | .read = property_read, | 585 | .read = property_read, |
586 | .write = property_write, | 586 | .write = property_write, |
587 | .release = property_release, | 587 | .release = property_release, |
588 | }; | 588 | }; |
589 | 589 | ||
590 | static struct file_operations openpromfs_nodenum_ops = { | 590 | static const struct file_operations openpromfs_nodenum_ops = { |
591 | .read = nodenum_read, | 591 | .read = nodenum_read, |
592 | }; | 592 | }; |
593 | 593 | ||
594 | static struct file_operations openprom_operations = { | 594 | static const struct file_operations openprom_operations = { |
595 | .read = generic_read_dir, | 595 | .read = generic_read_dir, |
596 | .readdir = openpromfs_readdir, | 596 | .readdir = openpromfs_readdir, |
597 | }; | 597 | }; |