Compilation fails in case of CONFIG_MTD_PARTITIONS && !CONFIG_MTD_PHYSMAP. Also put board-specific definitions inside #ifdef.
Signed-off-by: Kalle Pokki <[EMAIL PROTECTED]> --- arch/ppc/syslib/m8xx_setup.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c index 54303a7..7d3bf66 100644 --- a/arch/ppc/syslib/m8xx_setup.c +++ b/arch/ppc/syslib/m8xx_setup.c @@ -31,12 +31,10 @@ #include <linux/bootmem.h> #include <linux/seq_file.h> #include <linux/root_dev.h> -#if defined(CONFIG_MTD) && defined(CONFIG_MTD_PHYSMAP) #include <linux/mtd/partitions.h> #include <linux/mtd/physmap.h> #include <linux/mtd/mtd.h> #include <linux/mtd/map.h> -#endif #include <asm/mmu.h> #include <asm/reg.h> @@ -53,6 +51,7 @@ #include <asm/ppc_sys.h> #include "ppc8xx_pic.h" +#if defined (CONFIG_MPC86XADS) || defined (CONFIG_MPC885ADS) #ifdef CONFIG_MTD_PHYSMAP #define MPC8xxADS_BANK_WIDTH 4 #endif @@ -79,7 +78,8 @@ static struct mtd_partition mpc8xxads_pa #define mpc8xxads_part_num (sizeof (mpc8xxads_partitions) / sizeof (mpc8xxads_partitions[0])) -#endif +#endif /* CONFIG_MTD_PARTITIONS */ +#endif /* CONFIG_MPC86XADS || CONFIG_MPC855ADS */ static int m8xx_set_rtc_time(unsigned long time); static unsigned long m8xx_get_rtc_time(void); -- 1.4.1.1 _______________________________________________ Linuxppc-embedded mailing list [email protected] https://ozlabs.org/mailman/listinfo/linuxppc-embedded
