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 /arch/cris/arch-v32/drivers | |
| parent | ring-buffer: Add lost event count to end of sub buffer (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| download | linux-c1ab9cab75098924fa8226a8a371de66977439df.tar.xz linux-c1ab9cab75098924fa8226a8a371de66977439df.zip | |
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 'arch/cris/arch-v32/drivers')
| -rw-r--r-- | arch/cris/arch-v32/drivers/i2c.c | 1 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/pci/dma.c | 1 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/sync_serial.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/drivers/i2c.c b/arch/cris/arch-v32/drivers/i2c.c index 179e7b804331..506826399ae7 100644 --- a/arch/cris/arch-v32/drivers/i2c.c +++ b/arch/cris/arch-v32/drivers/i2c.c @@ -27,7 +27,6 @@ #include <linux/module.h> #include <linux/sched.h> -#include <linux/slab.h> #include <linux/errno.h> #include <linux/kernel.h> #include <linux/fs.h> diff --git a/arch/cris/arch-v32/drivers/pci/dma.c b/arch/cris/arch-v32/drivers/pci/dma.c index fbe65954ee6c..ee55578d9834 100644 --- a/arch/cris/arch-v32/drivers/pci/dma.c +++ b/arch/cris/arch-v32/drivers/pci/dma.c @@ -13,6 +13,7 @@ #include <linux/mm.h> #include <linux/string.h> #include <linux/pci.h> +#include <linux/gfp.h> #include <asm/io.h> void *dma_alloc_coherent(struct device *dev, size_t size, diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c index d2a0fbf5341f..4889f196ecd6 100644 --- a/arch/cris/arch-v32/drivers/sync_serial.c +++ b/arch/cris/arch-v32/drivers/sync_serial.c @@ -13,7 +13,6 @@ #include <linux/errno.h> #include <linux/major.h> #include <linux/sched.h> -#include <linux/slab.h> #include <linux/smp_lock.h> #include <linux/interrupt.h> #include <linux/poll.h> |