diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 04:44:47 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 04:44:47 +0100 |
commit | 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (patch) | |
tree | faf7ad871d87176423ff9ed1d1ba4d9c688fc23f /arch/sh | |
parent | Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | Revert "tracing: Include module.h in define_trace.h" (diff) | |
download | linux-32aaeffbd4a7457bf2f7448b33b5946ff2a960eb.tar.xz linux-32aaeffbd4a7457bf2f7448b33b5946ff2a960eb.zip |
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include <linux/module.h>
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include <linux/module.h>
net: sch_generic remove redundant use of <linux/module.h>
net: inet_timewait_sock doesnt need <linux/module.h>
...
Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/drivers/dma/dma-sysfs.c | 1 | ||||
-rw-r--r-- | arch/sh/drivers/pci/pci.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/shmobile/cpuidle.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/perf_event.c | 1 | ||||
-rw-r--r-- | arch/sh/kernel/topology.c | 1 | ||||
-rw-r--r-- | arch/sh/mm/init.c | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c index 1ee631d3725e..83cc704770d7 100644 --- a/arch/sh/drivers/dma/dma-sysfs.c +++ b/arch/sh/drivers/dma/dma-sysfs.c @@ -11,6 +11,7 @@ */ #include <linux/kernel.h> #include <linux/init.h> +#include <linux/stat.h> #include <linux/sysdev.h> #include <linux/platform_device.h> #include <linux/err.h> diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 194231cb5a70..c2691afe8f79 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -20,6 +20,7 @@ #include <linux/io.h> #include <linux/mutex.h> #include <linux/spinlock.h> +#include <linux/export.h> unsigned long PCIBIOS_MIN_IO = 0x0000; unsigned long PCIBIOS_MIN_MEM = 0; diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c index e4469e7233cb..7d98f909a8ac 100644 --- a/arch/sh/kernel/cpu/shmobile/cpuidle.c +++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c @@ -14,6 +14,7 @@ #include <linux/io.h> #include <linux/suspend.h> #include <linux/cpuidle.h> +#include <linux/export.h> #include <asm/suspend.h> #include <asm/uaccess.h> #include <asm/hwblk.h> diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c index 2ee21a47b5af..10b14e3a7eb8 100644 --- a/arch/sh/kernel/perf_event.c +++ b/arch/sh/kernel/perf_event.c @@ -25,6 +25,7 @@ #include <linux/io.h> #include <linux/irq.h> #include <linux/perf_event.h> +#include <linux/export.h> #include <asm/processor.h> struct cpu_hw_events { diff --git a/arch/sh/kernel/topology.c b/arch/sh/kernel/topology.c index ecc2d3d0f54a..4649a6ff0cfe 100644 --- a/arch/sh/kernel/topology.c +++ b/arch/sh/kernel/topology.c @@ -14,6 +14,7 @@ #include <linux/topology.h> #include <linux/node.h> #include <linux/nodemask.h> +#include <linux/export.h> static DEFINE_PER_CPU(struct cpu, cpu_devices); diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index c9dbace35b16..939ca0f356f6 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -18,6 +18,7 @@ #include <linux/io.h> #include <linux/memblock.h> #include <linux/dma-mapping.h> +#include <linux/export.h> #include <asm/mmu_context.h> #include <asm/mmzone.h> #include <asm/kexec.h> |