forked from luck/tmp_suning_uos_patched
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
|
||
|---|---|---|
| .. | ||
| altera-stapl | ||
| c2port | ||
| carma | ||
| cb710 | ||
| eeprom | ||
| ibmasm | ||
| iwmc3200top | ||
| lis3lv02d | ||
| sgi-gru | ||
| sgi-xp | ||
| ti-st | ||
| ab8500-pwm.c | ||
| ad525x_dpot-i2c.c | ||
| ad525x_dpot-spi.c | ||
| ad525x_dpot.c | ||
| ad525x_dpot.h | ||
| apds990x.c | ||
| apds9802als.c | ||
| arm-charlcd.c | ||
| atmel_pwm.c | ||
| atmel_tclib.c | ||
| atmel-ssc.c | ||
| bh1770glc.c | ||
| bh1780gli.c | ||
| bmp085.c | ||
| cs5535-mfgpt.c | ||
| ds1682.c | ||
| enclosure.c | ||
| ep93xx_pwm.c | ||
| fsa9480.c | ||
| hmc6352.c | ||
| hpilo.c | ||
| hpilo.h | ||
| ics932s401.c | ||
| ioc4.c | ||
| isl29003.c | ||
| isl29020.c | ||
| Kconfig | ||
| kgdbts.c | ||
| lkdtm.c | ||
| Makefile | ||
| pch_phub.c | ||
| phantom.c | ||
| pti.c | ||
| spear13xx_pcie_gadget.c | ||
| ti_dac7512.c | ||
| tifm_7xx1.c | ||
| tifm_core.c | ||
| tsl2550.c | ||
| vmw_balloon.c | ||