diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-21 00:57:39 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-21 00:57:39 +0200 |
| commit | f8cf8e47fb87e3b27e63d36fc8d61b11273f37bc (patch) | |
| tree | 8945f4cfc4c22e5c8c5f17c2bb7258be5a0f94e2 /arch/arm/mach-omap2/board-flash.c | |
| parent | Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 ... (diff) | |
| download | linux-f8cf8e47fb87e3b27e63d36fc8d61b11273f37bc.tar.xz linux-f8cf8e47fb87e3b27e63d36fc8d61b11273f37bc.zip | |
ARM: OMAP2+: Fix missing inline functions for Makefile cleanup
Commit f41caddbe73f52a42f529d668ce47b4d693fd2c0 (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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-flash.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-flash.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c index aa1b0cbe19d2..30a6f527510c 100644 --- a/arch/arm/mach-omap2/board-flash.c +++ b/arch/arm/mach-omap2/board-flash.c @@ -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 */ /** |