diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/macintosh/therm_adt746x.c | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/macintosh/therm_adt746x.c')
| -rw-r--r-- | drivers/macintosh/therm_adt746x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index a0f30d0853ea..3d3bf1643e73 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
| @@ -24,13 +24,14 @@ | |||
| 24 | #include <linux/suspend.h> | 24 | #include <linux/suspend.h> |
| 25 | #include <linux/kthread.h> | 25 | #include <linux/kthread.h> |
| 26 | #include <linux/moduleparam.h> | 26 | #include <linux/moduleparam.h> |
| 27 | #include <linux/freezer.h> | ||
| 27 | 28 | ||
| 28 | #include <asm/prom.h> | 29 | #include <asm/prom.h> |
| 29 | #include <asm/machdep.h> | 30 | #include <asm/machdep.h> |
| 30 | #include <asm/io.h> | 31 | #include <asm/io.h> |
| 31 | #include <asm/system.h> | 32 | #include <asm/system.h> |
| 32 | #include <asm/sections.h> | 33 | #include <asm/sections.h> |
| 33 | #include <asm/of_device.h> | 34 | #include <asm/of_platform.h> |
| 34 | 35 | ||
| 35 | #undef DEBUG | 36 | #undef DEBUG |
| 36 | 37 | ||