On Mon, Jun 22, 2009 at 11:15:23AM +0200, Florian Fainelli wrote:
> diff --git a/arch/mips/cavium-octeon/flash_setup.c b/arch/mips/cavium-octeon/flash_setup.c
> index 008f657..894edbb 100644
> --- a/arch/mips/cavium-octeon/flash_setup.c
> +++ b/arch/mips/cavium-octeon/flash_setup.c
> @@ -41,6 +41,7 @@ static int __init flash_init(void)
> */
> union cvmx_mio_boot_reg_cfgx region_cfg;
> region_cfg.u64 = cvmx_read_csr(CVMX_MIO_BOOT_REG_CFGX(0));
> +#if defined (CONFIG_MTD_COMPLEX_MAPPINGS) && (CONFIG_MTD_MAP_BANK_WIDTH_1)
^
no space
^^^
This should be defined(CONFIG_MTD_...)
Or bad things may happen.
The parenthesis in this expression are unnecessary.
> if (region_cfg.s.en) {
> /*
> * The bootloader always takes the flash and sets its
> @@ -78,6 +79,7 @@ static int __init flash_init(void)
> pr_err("Failed to register MTD device for flash\n");
> }
> }
> +#endif /* (CONFIG_MTD_COMPLEX_MAPPINGS) && (CONFIG_MTD_MAP_BANK_WIDTH_1) */
> return 0;
> }
Ralf
