The nand handler is only built in if config BAREBOX_UPDATE_IMX6_NAND is selected. Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx> --- arch/arm/mach-imx/include/mach/bbu.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/include/mach/bbu.h b/arch/arm/mach-imx/include/mach/bbu.h index 74c334a075a7..5eb9a47363af 100644 --- a/arch/arm/mach-imx/include/mach/bbu.h +++ b/arch/arm/mach-imx/include/mach/bbu.h @@ -27,8 +27,6 @@ int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile, int imx6_bbu_internal_spi_i2c_register_handler(const char *name, char *devicefile, unsigned long flags); -int imx6_bbu_nand_register_handler(const char *name, unsigned long flags); - int imx_bbu_external_nor_register_handler(const char *name, char *devicefile, unsigned long flags); @@ -70,13 +68,17 @@ static inline int imx6_bbu_internal_spi_i2c_register_handler(const char *name, c return -ENOSYS; } -static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags) +static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile, + unsigned long flags) { return -ENOSYS; } +#endif -static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile, - unsigned long flags) +#if defined(CONFIG_BAREBOX_UPDATE_IMX6_NAND) +int imx6_bbu_nand_register_handler(const char *name, unsigned long flags); +#else +static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags) { return -ENOSYS; } -- 2.1.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox