Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8cf8e47 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Fix missing inline functions for Makefile cleanup 



Commit f41caddb (omap2+: Use
Kconfig symbol in Makefile instead of obj-y) cleaned up the
omap2+ Makefile. However this did not account for the inline
functions that are now needed for board_flash_init and
board_nand_init.

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent ceb1c532

arch/arm/mach-omap2/board-flash.c

+0 −5
Original line number Diff line number Diff line
@@ -148,11 +148,6 @@ __init board_nand_init(struct mtd_partition *nand_parts, 
	board_nand_data.gpmc_irq = OMAP_GPMC_IRQ_BASE + cs;

	gpmc_nand_init(&board_nand_data);

}

#else

void

__init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs, int nand_type)

{

}

#endif /* CONFIG_MTD_NAND_OMAP2 || CONFIG_MTD_NAND_OMAP2_MODULE */



/**

arch/arm/mach-omap2/board-flash.h

+19 −0
Original line number Diff line number Diff line
@@ -24,7 +24,26 @@ struct flash_partitions { 
	int nr_parts;

};



#if defined(CONFIG_MTD_NAND_OMAP2) || \

		defined(CONFIG_MTD_NAND_OMAP2_MODULE) || \

		defined(CONFIG_MTD_ONENAND_OMAP2) || \

		defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)

extern void board_flash_init(struct flash_partitions [],

				char chip_sel[][GPMC_CS_NUM], int nand_type);

#else

static inline void board_flash_init(struct flash_partitions part[],

				char chip_sel[][GPMC_CS_NUM], int nand_type)

{

}

#endif



#if defined(CONFIG_MTD_NAND_OMAP2) || \

		defined(CONFIG_MTD_NAND_OMAP2_MODULE)

extern void board_nand_init(struct mtd_partition *nand_parts,

					u8 nr_parts, u8 cs, int nand_type);

#else

static inline void board_nand_init(struct mtd_partition *nand_parts,

					u8 nr_parts, u8 cs, int nand_type)

{

}

#endif