diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 19:44:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 19:44:47 -0800 |
| commit | 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (patch) | |
| tree | faf7ad871d87176423ff9ed1d1ba4d9c688fc23f /block | |
| parent | 208bca0860406d16398145ddd950036a737c3c9d (diff) | |
| parent | 67b84999b1a8b1af5625b1eabe92146c5eb42932 (diff) | |
| download | linux-3.10-32aaeffbd4a7457bf2f7448b33b5946ff2a960eb.tar.gz linux-3.10-32aaeffbd4a7457bf2f7448b33b5946ff2a960eb.tar.bz2 linux-3.10-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 'block')
| -rw-r--r-- | block/blk-integrity.c | 1 | ||||
| -rw-r--r-- | block/bsg-lib.c | 2 | ||||
| -rw-r--r-- | block/ioctl.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 129b9e209a3..da2a818c3a9 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -24,6 +24,7 @@ #include <linux/mempool.h> #include <linux/bio.h> #include <linux/scatterlist.h> +#include <linux/export.h> #include <linux/slab.h> #include "blk.h" diff --git a/block/bsg-lib.c b/block/bsg-lib.c index 6690e6e4103..7ad49c88f6b 100644 --- a/block/bsg-lib.c +++ b/block/bsg-lib.c @@ -25,7 +25,7 @@ #include <linux/delay.h> #include <linux/scatterlist.h> #include <linux/bsg-lib.h> -#include <linux/module.h> +#include <linux/export.h> #include <scsi/scsi_cmnd.h> /** diff --git a/block/ioctl.c b/block/ioctl.c index 5c74efc0190..ca939fc1030 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -1,5 +1,6 @@ #include <linux/capability.h> #include <linux/blkdev.h> +#include <linux/export.h> #include <linux/gfp.h> #include <linux/blkpg.h> #include <linux/hdreg.h> |