diff options
author | Tony Lindgren <tony@atomide.com> | 2011-11-23 23:46:10 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-11-23 23:46:10 +0100 |
commit | 52f3a41e0aca5625fbd118ed57a4debb25817e99 (patch) | |
tree | 86730c862fc97eef5f1eb1a81bf74bf2a8a36754 /fs/xfs/xfs_log.c | |
parent | ARM: OMAP: Fix reprogramming of dpll1 rate (diff) | |
parent | ARM: OMAP2+: Fix Compilation error when omap_l3_noc built as module (diff) | |
download | linux-52f3a41e0aca5625fbd118ed57a4debb25817e99.tar.xz linux-52f3a41e0aca5625fbd118ed57a4debb25817e99.zip |
Merge branch 'fixes-v3.2-rc2' into fixes
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r-- | fs/xfs/xfs_log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 2758a6277c52..a14cd89fe465 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -626,7 +626,7 @@ xfs_log_item_init( struct xfs_mount *mp, struct xfs_log_item *item, int type, - struct xfs_item_ops *ops) + const struct xfs_item_ops *ops) { item->li_mountp = mp; item->li_ailp = mp->m_ail; |