Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/m68k/include/asm/nettel.h b/arch/m68k/include/asm/nettel.h
index 0299f6a2deeb..4dec2d9fb994 100644
--- 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;
 }