diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2014-11-11 13:43:04 -0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-12 07:29:49 +0100 |
| commit | f97caf5684907445ab906ec76fff5ff20cfd2bff (patch) | |
| tree | 0124dc111cc8953767e172fb95650e9d6d618c54 /arch/arm/mach-imx/include/mach/bbu.h | |
| parent | 4b17d73c7da2f3ebc279297aef0c99f87743d100 (diff) | |
| download | barebox-f97caf5684907445ab906ec76fff5ff20cfd2bff.tar.gz barebox-f97caf5684907445ab906ec76fff5ff20cfd2bff.tar.xz | |
ARM: i.MX6 Phytec phyFLEX: Fix imx6_bbu_nand_register_handler prototype
imx6_bbu_nand_register_handler is dependent on
CONFIG_BAREBOX_UPDATE_IMX6_NAND. Change the protoype definition such
that said function is stubbed-out when CONFIG_BAREBOX_UPDATE_IMX6_NAND
is not defined.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/include/mach/bbu.h')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/bbu.h | 12 |
1 files 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 74c334a075..5eb9a47363 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; } |