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 /drivers/uwb | |
parent | 208bca0860406d16398145ddd950036a737c3c9d (diff) | |
parent | 67b84999b1a8b1af5625b1eabe92146c5eb42932 (diff) |
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 'drivers/uwb')
-rw-r--r-- | drivers/uwb/est.c | 1 | ||||
-rw-r--r-- | drivers/uwb/i1480/dfu/dfu.c | 1 | ||||
-rw-r--r-- | drivers/uwb/ie.c | 1 | ||||
-rw-r--r-- | drivers/uwb/lc-dev.c | 2 | ||||
-rw-r--r-- | drivers/uwb/lc-rc.c | 1 | ||||
-rw-r--r-- | drivers/uwb/neh.c | 1 | ||||
-rw-r--r-- | drivers/uwb/pal.c | 1 | ||||
-rw-r--r-- | drivers/uwb/radio.c | 1 | ||||
-rw-r--r-- | drivers/uwb/reset.c | 1 | ||||
-rw-r--r-- | drivers/uwb/rsv.c | 1 | ||||
-rw-r--r-- | drivers/uwb/scan.c | 1 | ||||
-rw-r--r-- | drivers/uwb/umc-bus.c | 1 | ||||
-rw-r--r-- | drivers/uwb/umc-dev.c | 1 | ||||
-rw-r--r-- | drivers/uwb/umc-drv.c | 1 | ||||
-rw-r--r-- | drivers/uwb/whci.c | 1 |
15 files changed, 16 insertions, 0 deletions
diff --git a/drivers/uwb/est.c b/drivers/uwb/est.c index a2eaa3c33b0b..de81ebf51784 100644 --- a/drivers/uwb/est.c +++ b/drivers/uwb/est.c @@ -41,6 +41,7 @@ */ #include <linux/spinlock.h> #include <linux/slab.h> +#include <linux/export.h> #include "uwb-internal.h" diff --git a/drivers/uwb/i1480/dfu/dfu.c b/drivers/uwb/i1480/dfu/dfu.c index da7b1d08003c..b08d1c2ee3fa 100644 --- a/drivers/uwb/i1480/dfu/dfu.c +++ b/drivers/uwb/i1480/dfu/dfu.c @@ -33,6 +33,7 @@ #include <linux/device.h> #include <linux/uwb.h> #include <linux/random.h> +#include <linux/export.h> /* * i1480_rceb_check - Check RCEB for expected field values diff --git a/drivers/uwb/ie.c b/drivers/uwb/ie.c index 30acec740425..902b0f2f961e 100644 --- a/drivers/uwb/ie.c +++ b/drivers/uwb/ie.c @@ -25,6 +25,7 @@ */ #include <linux/slab.h> +#include <linux/export.h> #include "uwb-internal.h" /** diff --git a/drivers/uwb/lc-dev.c b/drivers/uwb/lc-dev.c index 90113bafefca..5241f1d0ef7a 100644 --- a/drivers/uwb/lc-dev.c +++ b/drivers/uwb/lc-dev.c @@ -25,9 +25,11 @@ #include <linux/kernel.h> #include <linux/slab.h> #include <linux/device.h> +#include <linux/export.h> #include <linux/err.h> #include <linux/kdev_t.h> #include <linux/random.h> +#include <linux/stat.h> #include "uwb-internal.h" /* We initialize addresses to 0xff (invalid, as it is bcast) */ diff --git a/drivers/uwb/lc-rc.c b/drivers/uwb/lc-rc.c index b4395f41a007..4d688c750801 100644 --- a/drivers/uwb/lc-rc.c +++ b/drivers/uwb/lc-rc.c @@ -36,6 +36,7 @@ #include <linux/etherdevice.h> #include <linux/usb.h> #include <linux/slab.h> +#include <linux/export.h> #include "uwb-internal.h" diff --git a/drivers/uwb/neh.c b/drivers/uwb/neh.c index 697e56a5bcdd..a269937be1b8 100644 --- a/drivers/uwb/neh.c +++ b/drivers/uwb/neh.c @@ -85,6 +85,7 @@ #include <linux/timer.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/export.h> #include "uwb-internal.h" diff --git a/drivers/uwb/pal.c b/drivers/uwb/pal.c index 99a19c199095..8ee7d90a8c68 100644 --- a/drivers/uwb/pal.c +++ b/drivers/uwb/pal.c @@ -18,6 +18,7 @@ #include <linux/kernel.h> #include <linux/debugfs.h> #include <linux/uwb.h> +#include <linux/export.h> #include "uwb-internal.h" diff --git a/drivers/uwb/radio.c b/drivers/uwb/radio.c index f0d55495f5e9..d58dfecf9a79 100644 --- a/drivers/uwb/radio.c +++ b/drivers/uwb/radio.c @@ -17,6 +17,7 @@ */ #include <linux/kernel.h> #include <linux/uwb.h> +#include <linux/export.h> #include "uwb-internal.h" diff --git a/drivers/uwb/reset.c b/drivers/uwb/reset.c index 3de630b0f691..703228559e89 100644 --- a/drivers/uwb/reset.c +++ b/drivers/uwb/reset.c @@ -32,6 +32,7 @@ #include <linux/err.h> #include <linux/slab.h> #include <linux/delay.h> +#include <linux/export.h> #include "uwb-internal.h" diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c index 78c892233cf1..0b0d8bce842e 100644 --- a/drivers/uwb/rsv.c +++ b/drivers/uwb/rsv.c @@ -19,6 +19,7 @@ #include <linux/uwb.h> #include <linux/slab.h> #include <linux/random.h> +#include <linux/export.h> #include "uwb-internal.h" diff --git a/drivers/uwb/scan.c b/drivers/uwb/scan.c index 367aa12786b9..cbb6a5e703d2 100644 --- a/drivers/uwb/scan.c +++ b/drivers/uwb/scan.c @@ -36,6 +36,7 @@ #include <linux/device.h> #include <linux/err.h> #include <linux/slab.h> +#include <linux/stat.h> #include "uwb-internal.h" diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c index 5fad4e791b3e..82a84d53120f 100644 --- a/drivers/uwb/umc-bus.c +++ b/drivers/uwb/umc-bus.c @@ -8,6 +8,7 @@ #include <linux/kernel.h> #include <linux/sysfs.h> #include <linux/workqueue.h> +#include <linux/module.h> #include <linux/uwb/umc.h> #include <linux/pci.h> diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c index b2948ec57878..4613c13cd851 100644 --- a/drivers/uwb/umc-dev.c +++ b/drivers/uwb/umc-dev.c @@ -6,6 +6,7 @@ * This file is released under the GNU GPL v2. */ #include <linux/kernel.h> +#include <linux/export.h> #include <linux/slab.h> #include <linux/uwb/umc.h> diff --git a/drivers/uwb/umc-drv.c b/drivers/uwb/umc-drv.c index 367b5eb85d60..26d0ae1816bd 100644 --- a/drivers/uwb/umc-drv.c +++ b/drivers/uwb/umc-drv.c @@ -6,6 +6,7 @@ * This file is released under the GNU GPL v2. */ #include <linux/kernel.h> +#include <linux/export.h> #include <linux/uwb/umc.h> int __umc_driver_register(struct umc_driver *umc_drv, struct module *module, diff --git a/drivers/uwb/whci.c b/drivers/uwb/whci.c index b221142446a2..f48093e649e4 100644 --- a/drivers/uwb/whci.c +++ b/drivers/uwb/whci.c @@ -7,6 +7,7 @@ */ #include <linux/delay.h> #include <linux/kernel.h> +#include <linux/module.h> #include <linux/pci.h> #include <linux/dma-mapping.h> #include <linux/slab.h> |