diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /fs/nilfs2/ioctl.c | |
| parent | d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 (diff) | |
| parent | 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'fs/nilfs2/ioctl.c')
| -rw-r--r-- | fs/nilfs2/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index f6af76042d80..d6b2b83de363 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c | |||
| @@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp, | |||
| 480 | unsigned int cmd, void __user *argp) | 480 | unsigned int cmd, void __user *argp) |
| 481 | { | 481 | { |
| 482 | struct nilfs_argv argv[5]; | 482 | struct nilfs_argv argv[5]; |
| 483 | const static size_t argsz[5] = { | 483 | static const size_t argsz[5] = { |
| 484 | sizeof(struct nilfs_vdesc), | 484 | sizeof(struct nilfs_vdesc), |
| 485 | sizeof(struct nilfs_period), | 485 | sizeof(struct nilfs_period), |
| 486 | sizeof(__u64), | 486 | sizeof(__u64), |