linux-next: build failure after merge of the imx-mxs tree

[Stephen Rothwell]

Hi Shawn,

After merging the imx-mxs tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/clocksource/timer-imx-gpt.c: In function 'mxc_clocksource_init':
drivers/clocksource/timer-imx-gpt.c:173:2: error: invalid use of undefined type 'struct delay_timer'
  imx_delay_timer.read_current_timer = &imx_read_current_timer;
  ^
drivers/clocksource/timer-imx-gpt.c:174:2: error: invalid use of undefined type 'struct delay_timer'
  imx_delay_timer.freq = c;
  ^
drivers/clocksource/timer-imx-gpt.c:175:2: error: implicit declaration of function 'register_current_timer_delay' [-Werror=implicit-function-declaration]
  register_current_timer_delay(&imx_delay_timer);
  ^
drivers/clocksource/timer-imx-gpt.c: In function 'mxc_timer_init':
drivers/clocksource/timer-imx-gpt.c:458:2: error: implicit declaration of function 'clk_get_sys' [-Werror=implicit-function-declaration]
  imxtm->clk_per = clk_get_sys("imx-gpt.0", "per");
  ^
drivers/clocksource/timer-imx-gpt.c:458:17: warning: assignment makes pointer from integer without a cast
  imxtm->clk_per = clk_get_sys("imx-gpt.0", "per");
                 ^
drivers/clocksource/timer-imx-gpt.c:459:17: warning: assignment makes pointer from integer without a cast
  imxtm->clk_ipg = clk_get_sys("imx-gpt.0", "ipg");
                 ^
drivers/clocksource/timer-imx-gpt.c:461:31: error: 'SZ_4K' undeclared (first use in this function)
  imxtm->base = ioremap(pbase, SZ_4K);
                               ^

I am not quite sure what caused this ... I have disabled the driver
again today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpx3VseFKtS9.pgp
Description: OpenPGP digital signature