Merge branch 'linux-2.6'

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 8xx / mpc885ads.h

diff --git a/arch/powerpc/platforms/8xx/mpc885ads.h b/arch/powerpc/platforms/8xx/mpc885ads.h
index 30cbebfe84c549a0916c01ffd833b426dc08a7fc..14db1241706423038589e4fa47627954e79a298c 100644 (file)
--- a/arch/powerpc/platforms/8xx/mpc885ads.h
+++ b/arch/powerpc/platforms/8xx/mpc885ads.h
@@ -15,7 +15,6 @@
 #ifndef __ASM_MPC885ADS_H__
 #define __ASM_MPC885ADS_H__
 
-#include <asm/ppcboot.h>
 #include <sysdev/fsl_soc.h>
 
 /* U-Boot maps BCSR to 0xff080000 */
@@ -37,7 +36,7 @@
 #define CPM_MAP_ADDR           (get_immrbase() + MPC8xx_CPM_OFFSET)
 #define CPM_IRQ_OFFSET         16     // for compability with cpm_uart driver
 
-#define PCMCIA_MEM_ADDR                (uint)0xff020000)
+#define PCMCIA_MEM_ADDR                ((uint)0xff020000)
 #define PCMCIA_MEM_SIZE                ((uint)(64 * 1024))
 
 /* Bits of interest in the BCSRs.