diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 09:06:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 10:18:47 +0200 |
| commit | c1ab9cab75098924fa8226a8a371de66977439df (patch) | |
| tree | 767e77302ca8f2eb781c60624bc8518cd50ba6eb /drivers/w1/slaves | |
| parent | ff0ff84a0767df48d728c36510365344a7e7d582 (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into tracing/core
Conflicts:
include/linux/module.h
kernel/module.c
Semantic conflict:
include/trace/events/module.h
Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up
possibly racy module refcounting")
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/w1/slaves')
| -rw-r--r-- | drivers/w1/slaves/w1_ds2433.c | 1 | ||||
| -rw-r--r-- | drivers/w1/slaves/w1_ds2760.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c index 13944714882..d2bf32118a9 100644 --- a/drivers/w1/slaves/w1_ds2433.c +++ b/drivers/w1/slaves/w1_ds2433.c @@ -13,6 +13,7 @@ #include <linux/device.h> #include <linux/types.h> #include <linux/delay.h> +#include <linux/slab.h> #ifdef CONFIG_W1_SLAVE_DS2433_CRC #include <linux/crc16.h> diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c index 59f708efe25..6e153343e11 100644 --- a/drivers/w1/slaves/w1_ds2760.c +++ b/drivers/w1/slaves/w1_ds2760.c @@ -16,6 +16,7 @@ #include <linux/platform_device.h> #include <linux/mutex.h> #include <linux/idr.h> +#include <linux/gfp.h> #include "../w1.h" #include "../w1_int.h" |