From: Linus Walleij Date: Thu, 6 Sep 2012 08:06:52 +0000 (+0100) Subject: ARM: 7514/1: integrator: call common init function from machine X-Git-Tag: omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3~1^2~2^4~6 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bf26a180578b92890ed77890d4e9e9807adcda3;p=pandora-kernel.git ARM: 7514/1: integrator: call common init function from machine There is currently a common integrator_init() function set up to be called from an arch_initcall(). The problem is that it is using machine_is_integrator() which is not working with device tree, let's call this from respective machine initilization function and add a parameter to tell whether it's the Integrator/AP or Integrator/CP instead. There are still machine_is*() calls in the Integrator machines directory, but this one needs to be fixed lest we don't even get a UART console on the Integrator/AP after a Device Tree boot. Acked-by: Arnd Bergmann Signed-off-by: Linus Walleij Signed-off-by: Russell King --- Reading git-diff-tree failed