diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:36 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:36 +0200 |
| commit | c5438404db8c8fecff2cd9791b8e0debe679f0d7 (patch) | |
| tree | f9aceef1c34073fbf00e3bf9a17ab126b6362fbb /arch/arm/mach-imx/include/mach | |
| parent | e5ed4bea79282a629ac688daddbdd21d991e1d35 (diff) | |
| parent | 6ab66787fc15a286b6142b09f9d7c2654dee78a9 (diff) | |
| download | barebox-c5438404db8c8fecff2cd9791b8e0debe679f0d7.tar.gz barebox-c5438404db8c8fecff2cd9791b8e0debe679f0d7.tar.xz | |
Merge branch 'for-next/imx-bbu-nand-fcb'
Conflicts:
common/Kconfig
Diffstat (limited to 'arch/arm/mach-imx/include/mach')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/bbu.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-imx/include/mach/bbu.h b/arch/arm/mach-imx/include/mach/bbu.h index 5eb9a47363..8039091395 100644 --- a/arch/arm/mach-imx/include/mach/bbu.h +++ b/arch/arm/mach-imx/include/mach/bbu.h @@ -75,15 +75,6 @@ static inline int imx_bbu_external_nor_register_handler(const char *name, char * } #endif -#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; -} -#endif - #if defined(CONFIG_BAREBOX_UPDATE_IMX_EXTERNAL_NAND) int imx_bbu_external_nand_register_handler(const char *name, char *devicefile, unsigned long flags); |