From: Jon Loeliger Date: Mon, 7 Jan 2008 18:07:15 +0000 (+1100) Subject: [POWERPC] Use and not variants. X-Git-Tag: v2.6.25-rc1~1131^2~113 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0173d422aa32fa1e5141f1759202b955215c1da2;p=linux-2.6-omap-h63xx.git [POWERPC] Use and not variants. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c index 3388ad61999..5748ddb47d9 100644 --- a/arch/powerpc/kernel/of_device.c +++ b/arch/powerpc/kernel/of_device.c @@ -5,10 +5,10 @@ #include #include #include +#include #include #include -#include static void of_device_make_bus_id(struct of_device *dev) { diff --git a/arch/powerpc/platforms/44x/rainier.c b/arch/powerpc/platforms/44x/rainier.c index a4ce5ba8fe3..a7fae1cf69c 100644 --- a/arch/powerpc/platforms/44x/rainier.c +++ b/arch/powerpc/platforms/44x/rainier.c @@ -14,12 +14,13 @@ * option) any later version. */ #include +#include + #include #include #include #include #include -#include #include #include "44x.h" diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index 144177d77cf..3ce2d73b417 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -56,7 +57,6 @@ #include #include #include -#include #include #include #include