git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
drivers
/
macintosh
/
therm_adt746x.c
diff --git
a/drivers/macintosh/therm_adt746x.c
b/drivers/macintosh/therm_adt746x.c
index 13b953ae8ebc3d27da0f31fc7c5003fa4af38754..3d3bf1643e73ff98fc863cdd5d2ec6b8b5965291 100644
(file)
--- a/
drivers/macintosh/therm_adt746x.c
+++ b/
drivers/macintosh/therm_adt746x.c
@@
-24,6
+24,7
@@
#include <linux/suspend.h>
#include <linux/kthread.h>
#include <linux/moduleparam.h>
+#include <linux/freezer.h>
#include <asm/prom.h>
#include <asm/machdep.h>