ARM: OMAP: gpmc-nand: drop __init annotation
authorDaniel Mack <zonque@gmail.com>
Fri, 14 Dec 2012 10:36:42 +0000 (11:36 +0100)
committerTony Lindgren <tony@atomide.com>
Tue, 15 Jan 2013 22:50:15 +0000 (14:50 -0800)
gpmc_nand_init() will be called from another driver's probe() function,
so the easiest way to prevent section mismatches is to drop the
annotation here.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/gpmc-nand.c

index db969a5c4998d3c9b1904ff90d2134e2eb3c991a..3059f5e8ee8585ab1f702bf2185fdb24fde459b6 100644 (file)
@@ -89,7 +89,7 @@ static int omap2_nand_gpmc_retime(
        return 0;
 }
 
-static bool __init gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
+static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
 {
        /* support only OMAP3 class */
        if (!cpu_is_omap34xx()) {
@@ -110,8 +110,8 @@ static bool __init gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
        return 1;
 }
 
-int __init gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
-                         struct gpmc_timings *gpmc_t)
+int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
+                  struct gpmc_timings *gpmc_t)
 {
        int err = 0;
        struct device *dev = &gpmc_nand_device.dev;