On Fri, 2008-05-23 at 16:27 +1000, Stephen Rothwell wrote: > Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]>
Acked-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]> > --- > drivers/macintosh/smu.c | 4 ++-- > drivers/macintosh/therm_adt746x.c | 2 +- > drivers/macintosh/therm_pm72.c | 4 ++-- > drivers/macintosh/therm_windtunnel.c | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c > index 45c3a88..0372eba 100644 > --- a/drivers/macintosh/smu.c > +++ b/drivers/macintosh/smu.c > @@ -36,6 +36,8 @@ > #include <linux/poll.h> > #include <linux/mutex.h> > #include <linux/of.h> > +#include <linux/of_device.h> > +#include <linux/of_platform.h> > > #include <asm/byteorder.h> > #include <asm/io.h> > @@ -46,8 +48,6 @@ > #include <asm/sections.h> > #include <asm/abs_addr.h> > #include <asm/uaccess.h> > -#include <asm/of_device.h> > -#include <asm/of_platform.h> > > #define VERSION "0.7" > #define AUTHOR "(c) 2005 Benjamin Herrenschmidt, IBM Corp." > diff --git a/drivers/macintosh/therm_adt746x.c > b/drivers/macintosh/therm_adt746x.c > index 54f4942..7f0e20e 100644 > --- a/drivers/macintosh/therm_adt746x.c > +++ b/drivers/macintosh/therm_adt746x.c > @@ -24,13 +24,13 @@ > #include <linux/kthread.h> > #include <linux/moduleparam.h> > #include <linux/freezer.h> > +#include <linux/of_platform.h> > > #include <asm/prom.h> > #include <asm/machdep.h> > #include <asm/io.h> > #include <asm/system.h> > #include <asm/sections.h> > -#include <asm/of_platform.h> > > #undef DEBUG > > diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c > index ddfb426..817607e 100644 > --- a/drivers/macintosh/therm_pm72.c > +++ b/drivers/macintosh/therm_pm72.c > @@ -123,14 +123,14 @@ > #include <linux/i2c.h> > #include <linux/kthread.h> > #include <linux/mutex.h> > +#include <linux/of_device.h> > +#include <linux/of_platform.h> > #include <asm/prom.h> > #include <asm/machdep.h> > #include <asm/io.h> > #include <asm/system.h> > #include <asm/sections.h> > -#include <asm/of_device.h> > #include <asm/macio.h> > -#include <asm/of_platform.h> > > #include "therm_pm72.h" > > diff --git a/drivers/macintosh/therm_windtunnel.c > b/drivers/macintosh/therm_windtunnel.c > index d11821a..6d9e7ac 100644 > --- a/drivers/macintosh/therm_windtunnel.c > +++ b/drivers/macintosh/therm_windtunnel.c > @@ -37,13 +37,13 @@ > #include <linux/slab.h> > #include <linux/init.h> > #include <linux/kthread.h> > +#include <linux/of_platform.h> > > #include <asm/prom.h> > #include <asm/machdep.h> > #include <asm/io.h> > #include <asm/system.h> > #include <asm/sections.h> > -#include <asm/of_platform.h> > #include <asm/macio.h> > > #define LOG_TEMP 0 /* continously log > temperature */ > -- > 1.5.5.1 > _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
