diff options
author | Tony Lindgren <tony@atomide.com> | 2011-06-14 12:53:42 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-06-14 12:53:42 (GMT) |
commit | b8ce9fb8e18af7466e0b915bb5979322cdace322 (patch) | |
tree | eec6f9b58ce154fd863f0f78b374a697a5a7139b /arch/sparc/kernel/chmc.c | |
parent | c8e0bf95fc01d6e2ca585fe08010800b6c56e823 (diff) | |
parent | e9e35c5a2b2c803b5e2f25906d8ffe110670ceb6 (diff) | |
download | linux-fsl-qoriq-b8ce9fb8e18af7466e0b915bb5979322cdace322.tar.xz |
Merge branch 'fixes-v3.0-rc3' into devel-fixes
Diffstat (limited to 'arch/sparc/kernel/chmc.c')
-rw-r--r-- | arch/sparc/kernel/chmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c index 668c7be..5f45026 100644 --- a/arch/sparc/kernel/chmc.c +++ b/arch/sparc/kernel/chmc.c @@ -664,7 +664,7 @@ static void chmc_interpret_one_decode_reg(struct chmc *p, int which_bank, u64 va case 0x0: bp->interleave = 16; break; - }; + } /* UK[10] is reserved, and UK[11] is not set for the SDRAM * bank size definition. |