mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-27 11:55:53 +00:00
32aaeffbd4
* '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
|
||
|---|---|---|
| .. | ||
| apm_power.c | ||
| bq20z75.c | ||
| bq27x00_battery.c | ||
| collie_battery.c | ||
| da9030_battery.c | ||
| ds2760_battery.c | ||
| ds2780_battery.c | ||
| ds2782_battery.c | ||
| gpio-charger.c | ||
| intel_mid_battery.c | ||
| isp1704_charger.c | ||
| jz4740-battery.c | ||
| Kconfig | ||
| Makefile | ||
| max8903_charger.c | ||
| max8925_power.c | ||
| max8997_charger.c | ||
| max8998_charger.c | ||
| max17040_battery.c | ||
| max17042_battery.c | ||
| olpc_battery.c | ||
| pcf50633-charger.c | ||
| pda_power.c | ||
| pmu_battery.c | ||
| power_supply_core.c | ||
| power_supply_leds.c | ||
| power_supply_sysfs.c | ||
| power_supply.h | ||
| s3c_adc_battery.c | ||
| test_power.c | ||
| tosa_battery.c | ||
| twl4030_charger.c | ||
| wm97xx_battery.c | ||
| wm831x_backup.c | ||
| wm831x_power.c | ||
| wm8350_power.c | ||
| z2_battery.c | ||