Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 17:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
b9c913f327
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 mfd: Avoid to use constraint name in 88pm860x regulator driver 2011-05-26 19:45:38 +02:00
88pm860x-i2c.c mfd: Append additional read write on 88pm860x 2011-03-23 10:42:07 +01:00
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 mfd: Fix memory leak in ab3100_otp_probe 2010-08-12 11:27:17 +02:00
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 mach-ux500: move the DB8500 PRCMU driver to MFD 2011-05-24 22:14:31 +02:00
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 mfd: Convert adp5520 to dev_pm_ops 2011-03-23 10:41:43 +01:00
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 mfd: OLPC: Clean up names to match what OLPC actually uses 2011-03-27 00:09:31 +01:00
da903x.c mfd: Remove IRQF_DISABLED 2011-10-24 14:09:13 +02:00
davinci_voicecodec.c mfd: Use mfd cell platform_data for davinci cells platform bits 2011-05-26 19:45:13 +02:00
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 Fix common misspellings 2011-03-31 11:26:23 -03:00
htc-egpio.c mfd: Fold irq_set_chip/irq_set_handler 2011-03-27 00:09:52 +01:00
htc-i2cpld.c mfd: Fold irq_set_chip/irq_set_handler 2011-03-27 00:09:52 +01:00
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 mfd: Use mfd cell platform_data for janz cells platform bits 2011-05-26 19:45:08 +02:00
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 mfd: Remove checking on max8925 regulator[0] 2011-05-26 19:45:37 +02:00
max8925-i2c.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
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 mfd: Cleanup irq namespace 2011-03-27 00:09:51 +01:00
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 include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
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 mfd: pcf50633-adc: Fix potential race in pcf50633_adc_sync_read 2010-05-28 01:37:49 +02:00
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 mfd: Add pm8xxx irq support 2011-05-26 19:45:28 +02:00
pm8921-core.c mfd: Add pm8xxx irq support 2011-05-26 19:45:28 +02:00
rdc321x-southbridge.c mfd: Use mfd cell platform_data for rdc321x cells platform bits 2011-05-26 19:45:06 +02:00
sm501.c video, sm501: add OF binding to support SM501 2011-03-22 17:17:14 +09:00
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 mtd: Use platform_data to retrieve tmio_nand platform bits 2011-05-26 19:45:04 +02:00
tc3589x.c mfd: Add missing #ifdef around tc3589x PM block 2011-10-24 14:09:09 +02:00
tc6387xb.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
tc6393xb.c mtd: Use platform_data to retrieve tmio_nand platform bits 2011-05-26 19:45:04 +02:00
ti-ssp.c mfd: add driver for sequencer serial port 2011-03-15 08:17:22 -07:00
timberdale.c mfd: Clean timberdale error handling code up 2011-10-24 14:09:10 +02:00
timberdale.h [media] mfd: Add timberdale video-in driver to timberdale 2010-12-29 08:16:46 -02:00
tmio_core.c mfd: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required 2011-10-31 19:32:05 -04:00
tps6105x.c mfd: Use mfd cell platform_data for tps6105x cells platform bits 2011-05-26 19:45:11 +02:00
tps6507x.c mfd: Fix off-by-one value range checking for tps6507x 2010-10-29 00:30:29 +02:00
tps6586x.c mfd: Fix tps6586x GPIO value setting 2011-05-26 19:45:31 +02:00
tps65010.c mfd: Include <linux/gpio.h> instead of <asm/gpio.h> 2011-01-14 12:37:36 +01:00
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 MFD: twl4030-audio: Rename platform data 2011-07-04 18:44:02 +03:00
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 mfd: Check twl4030-power remove script error condition after i2cwrite 2011-05-26 19:45:41 +02:00
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 MFD: twl6040: Demand valid interrupt configuration 2011-07-07 14:23:25 +03:00
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 mfd: Fix twl-irq function declaration warnings 2010-10-29 00:30:16 +02:00
ucb1x00-assabet.c
ucb1x00-core.c
ucb1x00-ts.c mfd: Add BTN_TOUCH event to ucb1x00-ts 2011-03-23 10:41:45 +01:00
ucb1400_core.c Fix common misspellings 2011-03-31 11:26:23 -03:00
vx855.c mfd: Add MODULE_DEVICE_TABLE to vx855 2011-03-23 10:41:59 +01:00
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 mfd: Fix wrong wm8350-core kfree in error path 2010-08-12 11:28:08 +02:00
wm8350-gpio.c mfd: Rename wm8350 static gpio_set_debounce() 2011-09-06 16:37:58 +02:00
wm8350-i2c.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
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