Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68k fixes from Greg Ungerer:
 "Nothing big, spelling fixes and fix/cleanup for ColdFire eth device setup"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: fix fec setup warning for ColdFire 5271 builds
  m68knommu: ColdFire 5271 only has a single FEC controller
  m68k: Fix trivial typos in comments

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/m68k/coldfire/m527x.c b/arch/m68k/coldfire/m527x.c
index 2ba470735bed..c0b3e28f91df 100644
--- a/arch/m68k/coldfire/m527x.c
+++ b/arch/m68k/coldfire/m527x.c
@@ -92,7 +92,6 @@ static void __init m527x_uarts_init(void)
 
 static void __init m527x_fec_init(void)
 {
-        u16 par;
         u8 v;
 
         /* Set multi-function pins to ethernet mode for fec0 */
@@ -100,6 +99,8 @@ static void __init m527x_fec_init(void)
         v = readb(MCFGPIO_PAR_FECI2C);
         writeb(v | 0xf0, MCFGPIO_PAR_FECI2C);
 #else
+        u16 par;
+
         par = readw(MCFGPIO_PAR_FECI2C);
         writew(par | 0xf00, MCFGPIO_PAR_FECI2C);
         v = readb(MCFGPIO_PAR_FEC0HL);