diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 07:44:47 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 07:44:47 +0400 |
commit | 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (patch) | |
tree | faf7ad871d87176423ff9ed1d1ba4d9c688fc23f /crypto | |
parent | 208bca0860406d16398145ddd950036a737c3c9d (diff) | |
parent | 67b84999b1a8b1af5625b1eabe92146c5eb42932 (diff) | |
download | linux-32aaeffbd4a7457bf2f7448b33b5946ff2a960eb.tar.xz |
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 'crypto')
-rw-r--r-- | crypto/async_tx/async_memcpy.c | 1 | ||||
-rw-r--r-- | crypto/async_tx/async_pq.c | 1 | ||||
-rw-r--r-- | crypto/async_tx/async_raid6_recov.c | 1 | ||||
-rw-r--r-- | crypto/async_tx/async_tx.c | 1 | ||||
-rw-r--r-- | crypto/async_tx/async_xor.c | 1 | ||||
-rw-r--r-- | crypto/async_tx/raid6test.c | 1 | ||||
-rw-r--r-- | crypto/crypto_wq.c | 1 | ||||
-rw-r--r-- | crypto/md4.c | 1 | ||||
-rw-r--r-- | crypto/proc.c | 1 | ||||
-rw-r--r-- | crypto/vmac.c | 1 | ||||
-rw-r--r-- | crypto/xcbc.c | 1 |
11 files changed, 11 insertions, 0 deletions
diff --git a/crypto/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c index 518c22bd9562..0d5a90ca6501 100644 --- a/crypto/async_tx/async_memcpy.c +++ b/crypto/async_tx/async_memcpy.c @@ -25,6 +25,7 @@ */ #include <linux/kernel.h> #include <linux/highmem.h> +#include <linux/module.h> #include <linux/mm.h> #include <linux/dma-mapping.h> #include <linux/async_tx.h> diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c index fdd8257d35d9..91d5d385899e 100644 --- a/crypto/async_tx/async_pq.c +++ b/crypto/async_tx/async_pq.c @@ -21,6 +21,7 @@ */ #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/module.h> #include <linux/dma-mapping.h> #include <linux/raid/pq.h> #include <linux/async_tx.h> diff --git a/crypto/async_tx/async_raid6_recov.c b/crypto/async_tx/async_raid6_recov.c index ce038d861eb9..a9f08a6a582e 100644 --- a/crypto/async_tx/async_raid6_recov.c +++ b/crypto/async_tx/async_raid6_recov.c @@ -22,6 +22,7 @@ */ #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/module.h> #include <linux/dma-mapping.h> #include <linux/raid/pq.h> #include <linux/async_tx.h> diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c index 7f2c00a45205..842120979374 100644 --- a/crypto/async_tx/async_tx.c +++ b/crypto/async_tx/async_tx.c @@ -24,6 +24,7 @@ * */ #include <linux/rculist.h> +#include <linux/module.h> #include <linux/kernel.h> #include <linux/async_tx.h> diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index bc28337fded2..154cc84381c2 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -25,6 +25,7 @@ */ #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/module.h> #include <linux/mm.h> #include <linux/dma-mapping.h> #include <linux/raid/xor.h> diff --git a/crypto/async_tx/raid6test.c b/crypto/async_tx/raid6test.c index c88ff9e3fd30..aa2b0270ed16 100644 --- a/crypto/async_tx/raid6test.c +++ b/crypto/async_tx/raid6test.c @@ -23,6 +23,7 @@ #include <linux/gfp.h> #include <linux/mm.h> #include <linux/random.h> +#include <linux/module.h> #undef pr #define pr(fmt, args...) pr_info("raid6test: " fmt, ##args) diff --git a/crypto/crypto_wq.c b/crypto/crypto_wq.c index b980ee1af459..adad92a44ba2 100644 --- a/crypto/crypto_wq.c +++ b/crypto/crypto_wq.c @@ -12,6 +12,7 @@ */ #include <linux/workqueue.h> +#include <linux/module.h> #include <crypto/algapi.h> #include <crypto/crypto_wq.h> diff --git a/crypto/md4.c b/crypto/md4.c index 7fca1f59a4f5..0477a6a01d58 100644 --- a/crypto/md4.c +++ b/crypto/md4.c @@ -23,6 +23,7 @@ #include <crypto/internal/hash.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/module.h> #include <linux/string.h> #include <linux/types.h> #include <asm/byteorder.h> diff --git a/crypto/proc.c b/crypto/proc.c index 3808697814d7..4a0a7aad2204 100644 --- a/crypto/proc.c +++ b/crypto/proc.c @@ -16,6 +16,7 @@ #include <linux/atomic.h> #include <linux/init.h> #include <linux/crypto.h> +#include <linux/module.h> /* for module_name() */ #include <linux/rwsem.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> diff --git a/crypto/vmac.c b/crypto/vmac.c index f35ff8a3926e..4243905ba135 100644 --- a/crypto/vmac.c +++ b/crypto/vmac.c @@ -27,6 +27,7 @@ #include <linux/init.h> #include <linux/types.h> #include <linux/crypto.h> +#include <linux/module.h> #include <linux/scatterlist.h> #include <asm/byteorder.h> #include <crypto/scatterwalk.h> diff --git a/crypto/xcbc.c b/crypto/xcbc.c index bb7b67fba349..a5fbdf3738cf 100644 --- a/crypto/xcbc.c +++ b/crypto/xcbc.c @@ -22,6 +22,7 @@ #include <crypto/internal/hash.h> #include <linux/err.h> #include <linux/kernel.h> +#include <linux/module.h> static u_int32_t ks[12] = {0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, |