Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ad9e05aef7c861280b404d38fb50a8ff11d01e11

Authored by Stephen Rothwell
Committed by Paul Mackerras
1 parent 7587cb2f12
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 4 changed files with 6 additions and 6 deletions Side-by-side Diff

drivers/macintosh/smu.c
Diff comments   View file @ ad9e05a
... ... @@ -35,6 +35,8 @@
35 35 #include <linux/sysdev.h>
36 36 #include <linux/poll.h>
37 37 #include <linux/mutex.h>
  38 +#include <linux/of_device.h>
  39 +#include <linux/of_platform.h>
38 40  
39 41 #include <asm/byteorder.h>
40 42 #include <asm/io.h>
... ... @@ -45,8 +47,6 @@
45 47 #include <asm/sections.h>
46 48 #include <asm/abs_addr.h>
47 49 #include <asm/uaccess.h>
48   -#include <asm/of_device.h>
49   -#include <asm/of_platform.h>
50 50  
51 51 #define VERSION "0.7"
52 52 #define AUTHOR "(c) 2005 Benjamin Herrenschmidt, IBM Corp."
drivers/macintosh/therm_adt746x.c
Diff comments   View file @ ad9e05a
... ... @@ -24,13 +24,13 @@
24 24 #include <linux/kthread.h>
25 25 #include <linux/moduleparam.h>
26 26 #include <linux/freezer.h>
  27 +#include <linux/of_platform.h>
27 28  
28 29 #include <asm/prom.h>
29 30 #include <asm/machdep.h>
30 31 #include <asm/io.h>
31 32 #include <asm/system.h>
32 33 #include <asm/sections.h>
33   -#include <asm/of_platform.h>
34 34  
35 35 #undef DEBUG
36 36  
drivers/macintosh/therm_pm72.c
Diff comments   View file @ ad9e05a
... ... @@ -123,14 +123,14 @@
123 123 #include <linux/i2c.h>
124 124 #include <linux/kthread.h>
125 125 #include <linux/mutex.h>
  126 +#include <linux/of_device.h>
  127 +#include <linux/of_platform.h>
126 128 #include <asm/prom.h>
127 129 #include <asm/machdep.h>
128 130 #include <asm/io.h>
129 131 #include <asm/system.h>
130 132 #include <asm/sections.h>
131   -#include <asm/of_device.h>
132 133 #include <asm/macio.h>
133   -#include <asm/of_platform.h>
134 134  
135 135 #include "therm_pm72.h"
136 136  
drivers/macintosh/therm_windtunnel.c
Diff comments   View file @ ad9e05a
... ... @@ -37,13 +37,13 @@
37 37 #include <linux/slab.h>
38 38 #include <linux/init.h>
39 39 #include <linux/kthread.h>
  40 +#include <linux/of_platform.h>
40 41  
41 42 #include <asm/prom.h>
42 43 #include <asm/machdep.h>
43 44 #include <asm/io.h>
44 45 #include <asm/system.h>
45 46 #include <asm/sections.h>
46   -#include <asm/of_platform.h>
47 47 #include <asm/macio.h>
48 48  
49 49 #define LOG_TEMP 0 /* continously log temperature */