kevin/linux
1
Fork 0
Code
34324dc2bf
linux/drivers/mfd
History
Linus Torvalds 32aaeffbd4 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
2011-11-06 19:44:47 -08:00
..
88pm860x-core.c
88pm860x-i2c.c
aat2870-core.c mfd: Fix aat2870 build failure for x86_64 2011-10-24 14:09:17 +02:00
ab3100-core.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
ab3100-otp.c
ab5500-core.c mfd: Break out ab5500 debugfs code 2011-10-24 14:09:16 +02:00
ab5500-core.h mfd: Break out ab5500 debugfs code 2011-10-24 14:09:16 +02:00
ab5500-debugfs.c mfd: Break out ab5500 debugfs code 2011-10-24 14:09:16 +02:00
ab5500-debugfs.h mfd: Break out ab5500 debugfs code 2011-10-24 14:09:16 +02:00
ab8500-core.c mfd: Expose TurnOnStatus in ab8500 sysfs 2011-10-24 14:09:20 +02:00
ab8500-debugfs.c mfd: Add module.h to the implicit drivers/mfd users 2011-10-31 19:32:04 -04:00
ab8500-gpadc.c mfd: Refactor ab8500 GPADC API, add raw access 2011-10-24 14:09:10 +02:00
ab8500-i2c.c
ab8500-sysctrl.c mfd: Add module.h to the implicit drivers/mfd users 2011-10-31 19:32:04 -04:00
abx500-core.c mfd: Add module.h to the implicit drivers/mfd users 2011-10-31 19:32:04 -04:00
adp5520.c
asic3.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
cs5535-mfd.c
da903x.c mfd: Remove IRQF_DISABLED 2011-10-24 14:09:13 +02:00
davinci_voicecodec.c
db5500-prcmu.c mfd: Fix db5500-prcmu defines 2011-10-24 14:09:19 +02:00
db8500-prcmu.c mfd: Convert db8500-prcmu panic() into pr_crit() 2011-10-24 14:09:19 +02:00
dbx500-prcmu-regs.h mfd: Move to the new db500 PRCMU API 2011-10-24 14:09:18 +02:00
dm355evm_msp.c mfd: Add module.h to the implicit drivers/mfd users 2011-10-31 19:32:04 -04:00
ezx-pcap.c
htc-egpio.c
htc-i2cpld.c
htc-pasic3.c w1: ds1wm: add a reset recovery parameter 2011-07-08 21:14:44 -07:00
intel_msic.c mfd: Add missing <linux/io.h> include to intel_msic 2011-10-24 14:09:20 +02:00
janz-cmodio.c
jz4740-adc.c mfd: Make jz4740_adc_driver static 2011-10-24 14:09:15 +02:00
Kconfig Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
lpc_sch.c mfd: Add tunnelcreek watchdog to lpc_sch devices 2011-07-31 23:28:23 +02:00
Makefile mfd: Delete ab3550 driver 2011-10-24 14:09:16 +02:00
max8925-core.c
max8925-i2c.c
max8997-irq.c mfd: Remove dead code from max8997-irq 2011-07-31 23:28:25 +02:00
max8997.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
max8998-irq.c
max8998.c power_supply: Add charger driver for MAX8998/LP3974 2011-07-08 16:59:34 +04:00
mc13xxx-core.c mfd: Fix a sparse warning about mc13xxx_chipname not being declared 2011-10-24 14:09:17 +02:00
mcp-core.c
mcp-sa11x0.c
menelaus.c Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
mfd-core.c mfd: Add module.h to the implicit drivers/mfd users 2011-10-31 19:32:04 -04:00
omap-usb-host.c mfd: Fix omap-usb-host build failure 2011-09-06 16:37:59 +02:00
pcf50633-adc.c
pcf50633-core.c mfd: Convert pcf50633 to use new register map API 2011-10-24 14:09:08 +02:00
pcf50633-gpio.c
pcf50633-irq.c mfd: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required 2011-10-31 19:32:05 -04:00
pm8xxx-irq.c
pm8921-core.c
rdc321x-southbridge.c
sm501.c
stmpe.c mfd: Fix missing stmpe kerneldoc 2011-07-31 23:28:25 +02:00
stmpe.h mfd: Fix missing stmpe kerneldoc 2011-07-31 23:28:25 +02:00
t7l66xb.c
tc3589x.c mfd: Add missing #ifdef around tc3589x PM block 2011-10-24 14:09:09 +02:00
tc6387xb.c
tc6393xb.c
ti-ssp.c
timberdale.c mfd: Clean timberdale error handling code up 2011-10-24 14:09:10 +02:00
timberdale.h
tmio_core.c mfd: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required 2011-10-31 19:32:05 -04:00
tps6105x.c
tps6507x.c
tps6586x.c
tps65010.c
tps65910-irq.c mfd: Fix initialisation of tps65910 interrupts 2011-09-06 16:37:59 +02:00
tps65910.c mfd: Avoid two assignments if failures happen in tps65910_i2c_probe 2011-07-31 23:28:26 +02:00
tps65911-comparator.c mfd: Remove comp{1,2}_threshold sysfs entries in tps65911_comparator_remove 2011-07-31 23:28:24 +02:00
tps65912-core.c mfd: Do not leak init_data in tps65912_device_init() 2011-10-24 14:09:15 +02:00
tps65912-i2c.c mfd: Fix off-by-one value range checking for tps65912_i2c_write 2011-07-31 23:28:25 +02:00
tps65912-irq.c tps65912: irq: add interrupt controller 2011-07-31 23:28:22 +02:00
tps65912-spi.c mfd: tps65912: Add new mfd device 2011-07-31 23:28:22 +02:00
twl4030-audio.c
twl4030-irq.c mfd: Remove IRQF_DISABLED flag from twl4030-irq 2011-10-24 14:09:13 +02:00
twl4030-madc.c mfd: Turn on the twl4030-madc MADC clock 2011-10-24 14:09:10 +02:00
twl4030-power.c
twl6030-irq.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
twl6030-pwm.c mfd: twl6030-pwm.c needs MODULE_LICENSE 2011-07-31 23:28:27 +02:00
twl6040-core.c MFD: twl6040: function to query the vibra status for clients 2011-10-12 11:48:49 +01:00
twl6040-irq.c
twl-core.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
twl-core.h
ucb1x00-assabet.c
ucb1x00-core.c
ucb1x00-ts.c
ucb1400_core.c
vx855.c
wl1273-core.c mfd: Add module.h to the implicit drivers/mfd users 2011-10-31 19:32:04 -04:00
wm831x-auxadc.c mfd: Support multiple active WM831x AUXADC conversions 2011-07-31 23:28:20 +02:00
wm831x-core.c mfd: Support software initiated shutdown of WM831x PMICs 2011-10-24 14:09:13 +02:00
wm831x-i2c.c mfd: Support software initiated shutdown of WM831x PMICs 2011-10-24 14:09:13 +02:00
wm831x-irq.c mfd: Simulate active high IRQs with wm831x 2011-10-24 14:09:14 +02:00
wm831x-otp.c
wm831x-spi.c mfd: Support software initiated shutdown of WM831x PMICs 2011-10-24 14:09:13 +02:00
wm8350-core.c
wm8350-gpio.c mfd: Rename wm8350 static gpio_set_debounce() 2011-09-06 16:37:58 +02:00
wm8350-i2c.c
wm8350-irq.c mfd: Allocate wm835x irq descs dynamically 2011-07-31 23:28:20 +02:00
wm8350-regmap.c
wm8400-core.c mfd: Add module.h to the implicit drivers/mfd users 2011-10-31 19:32:04 -04:00
wm8994-core.c Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
wm8994-irq.c mfd: Acknowledge WM8994 IRQs before reporting 2011-07-31 23:28:27 +02:00