Merge branch 'bugzilla-13620' into release

[firefly-linux-kernel-4.4.55.git] / arch / m68k / include / asm / nettel.h

diff --git a/arch/m68k/include/asm/nettel.h b/arch/m68k/include/asm/nettel.h
index 0299f6a2deeb62f548129f269a150218570b8789..4dec2d9fb99442e3752a21f6da4f9b25255f9024 100644 (file)
--- a/arch/m68k/include/asm/nettel.h
+++ b/arch/m68k/include/asm/nettel.h
@@ -48,14 +48,14 @@ extern volatile unsigned short ppdata;
 static __inline__ unsigned int mcf_getppdata(void)
 {
        volatile unsigned short *pp;
-       pp = (volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT);
+       pp = (volatile unsigned short *) MCFSIM_PADAT;
        return((unsigned int) *pp);
 }
 
 static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits)
 {
        volatile unsigned short *pp;
-       pp = (volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT);
+       pp = (volatile unsigned short *) MCFSIM_PADAT;
        ppdata = (ppdata & ~mask) | bits;
        *pp = ppdata;
 }