target/linux/omap24xx/patches-3.3/910-omap-fix-section-mismatch-warnings.patch

   1 --- a/arch/arm/plat-omap/omap_device.c
   2 +++ b/arch/arm/plat-omap/omap_device.c
   3 @@ -619,7 +619,7 @@ static void omap_device_delete(struct om
   4   * information.  Returns ERR_PTR(-EINVAL) if @oh is NULL; otherwise,
   5   * passes along the return value of omap_device_build_ss().
   6   */
   7 -struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
   8 +struct platform_device *__init omap_device_build(const char *pdev_name, int pdev_id,
   9                                       struct omap_hwmod *oh, void *pdata,
  10                                       int pdata_len,
  11                                       struct omap_device_pm_latency *pm_lats,
  12 @@ -652,7 +652,7 @@ struct platform_device *omap_device_buil
  13   * platform_device record.  Returns an ERR_PTR() on error, or passes
  14   * along the return value of omap_device_register().
  15   */
  16 -struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
  17 +struct platform_device *__init omap_device_build_ss(const char *pdev_name, int pdev_id,
  18                                          struct omap_hwmod **ohs, int oh_cnt,
  19                                          void *pdata, int pdata_len,
  20                                          struct omap_device_pm_latency *pm_lats,
  21 @@ -717,7 +717,7 @@ odbs_exit:
  22   * platform_early_add_device() on the underlying platform_device.
  23   * Returns 0 by default.
  24   */
  25 -static int omap_early_device_register(struct platform_device *pdev)
  26 +static int __init omap_early_device_register(struct platform_device *pdev)
  27  {
  28         struct platform_device *devices[1];
  29
  30 --- a/arch/arm/plat-omap/common.c
  31 +++ b/arch/arm/plat-omap/common.c
  32 @@ -29,7 +29,7 @@
  33
  34  #define NO_LENGTH_CHECK 0xffffffff
  35
  36 -struct omap_board_config_kernel *omap_board_config __initdata;
  37 +struct omap_board_config_kernel *omap_board_config;
  38  int omap_board_config_size;
  39
  40  unsigned char omap_bootloader_tag[1024];
  41 @@ -58,7 +58,7 @@ __tagtable(ATAG_BOARD, parse_tag_omap);
  42
  43  #endif
  44
  45 -static const void *__init get_config(u16 tag, size_t len,
  46 +static const void *get_config(u16 tag, size_t len,
  47                 int skip, size_t *len_out)
  48  {
  49         struct omap_board_config_kernel *kinfo = NULL;
  50 @@ -125,12 +125,12 @@ static const void *__init get_config(u16
  51         return kinfo->data;
  52  }
  53
  54 -const void *__init __omap_get_config(u16 tag, size_t len, int nr)
  55 +const void *__omap_get_config(u16 tag, size_t len, int nr)
  56  {
  57          return get_config(tag, len, nr, NULL);
  58  }
  59
  60 -const void *__init omap_get_var_config(u16 tag, size_t *len)
  61 +const void *omap_get_var_config(u16 tag, size_t *len)
  62  {
  63          return get_config(tag, NO_LENGTH_CHECK, 0, len);
  64  }
  65 --- a/arch/arm/mach-omap2/devices.c
  66 +++ b/arch/arm/mach-omap2/devices.c
  67 @@ -380,7 +380,7 @@ static inline void omap_init_dmic(void)
  68
  69  #include <plat/mcspi.h>
  70
  71 -static int omap_mcspi_init(struct omap_hwmod *oh, void *unused)
  72 +static int __init omap_mcspi_init(struct omap_hwmod *oh, void *unused)
  73  {
  74         struct platform_device *pdev;
  75         char *name = "omap2_mcspi";
  76 --- a/arch/arm/mach-omap2/gpio.c
  77 +++ b/arch/arm/mach-omap2/gpio.c
  78 @@ -24,7 +24,7 @@
  79  #include <plat/omap_hwmod.h>
  80  #include <plat/omap_device.h>
  81
  82 -static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
  83 +static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
  84  {
  85         struct platform_device *pdev;
  86         struct omap_gpio_platform_data *pdata;
  87 --- a/arch/arm/mach-omap2/mcbsp.c
  88 +++ b/arch/arm/mach-omap2/mcbsp.c
  89 @@ -122,7 +122,7 @@ static int omap3_enable_st_clock(unsigne
  90         return 0;
  91  }
  92
  93 -static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
  94 +static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
  95  {
  96         int id, count = 1;
  97         char *name = "omap-mcbsp";
  98 --- a/arch/arm/plat-omap/include/plat/board.h
  99 +++ b/arch/arm/plat-omap/include/plat/board.h
 100 @@ -159,14 +159,14 @@ struct omap_gpio_switch_config {
 101         int key_code:24; /* Linux key code */
 102  };
 103
 104 -extern const void *__init __omap_get_config(u16 tag, size_t len, int nr);
 105 +extern const void * __omap_get_config(u16 tag, size_t len, int nr);
 106
 107  #define omap_get_config(tag, type) \
 108         ((const type *) __omap_get_config((tag), sizeof(type), 0))
 109  #define omap_get_nr_config(tag, type, nr) \
 110         ((const type *) __omap_get_config((tag), sizeof(type), (nr)))
 111
 112 -extern const void *__init omap_get_var_config(u16 tag, size_t *len);
 113 +extern const void * omap_get_var_config(u16 tag, size_t *len);
 114
 115  extern struct omap_board_config_kernel *omap_board_config;
 116  extern int omap_board_config_size;