Browse Source

macintosh: Use linux/of_{device,platform}.h instead of asm

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Stephen Rothwell 17 years ago
parent
commit
ad9e05aef7

+ 2 - 2
drivers/macintosh/smu.c

@@ -35,6 +35,8 @@
 #include <linux/sysdev.h>
 #include <linux/sysdev.h>
 #include <linux/poll.h>
 #include <linux/poll.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
 
 
 #include <asm/byteorder.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
 #include <asm/io.h>
@@ -45,8 +47,6 @@
 #include <asm/sections.h>
 #include <asm/sections.h>
 #include <asm/abs_addr.h>
 #include <asm/abs_addr.h>
 #include <asm/uaccess.h>
 #include <asm/uaccess.h>
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
 
 
 #define VERSION "0.7"
 #define VERSION "0.7"
 #define AUTHOR  "(c) 2005 Benjamin Herrenschmidt, IBM Corp."
 #define AUTHOR  "(c) 2005 Benjamin Herrenschmidt, IBM Corp."

+ 1 - 1
drivers/macintosh/therm_adt746x.c

@@ -24,13 +24,13 @@
 #include <linux/kthread.h>
 #include <linux/kthread.h>
 #include <linux/moduleparam.h>
 #include <linux/moduleparam.h>
 #include <linux/freezer.h>
 #include <linux/freezer.h>
+#include <linux/of_platform.h>
 
 
 #include <asm/prom.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/machdep.h>
 #include <asm/io.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/system.h>
 #include <asm/sections.h>
 #include <asm/sections.h>
-#include <asm/of_platform.h>
 
 
 #undef DEBUG
 #undef DEBUG
 
 

+ 2 - 2
drivers/macintosh/therm_pm72.c

@@ -123,14 +123,14 @@
 #include <linux/i2c.h>
 #include <linux/i2c.h>
 #include <linux/kthread.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
 #include <linux/mutex.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
 #include <asm/prom.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/machdep.h>
 #include <asm/io.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/system.h>
 #include <asm/sections.h>
 #include <asm/sections.h>
-#include <asm/of_device.h>
 #include <asm/macio.h>
 #include <asm/macio.h>
-#include <asm/of_platform.h>
 
 
 #include "therm_pm72.h"
 #include "therm_pm72.h"
 
 

+ 1 - 1
drivers/macintosh/therm_windtunnel.c

@@ -37,13 +37,13 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/init.h>
 #include <linux/kthread.h>
 #include <linux/kthread.h>
+#include <linux/of_platform.h>
 
 
 #include <asm/prom.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/machdep.h>
 #include <asm/io.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/system.h>
 #include <asm/sections.h>
 #include <asm/sections.h>
-#include <asm/of_platform.h>
 #include <asm/macio.h>
 #include <asm/macio.h>
 
 
 #define LOG_TEMP		0			/* continously log temperature */
 #define LOG_TEMP		0			/* continously log temperature */