2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
linux-next/include/linux/regulator
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
..
ab8500.h regulator: initialization for ab8500 regulators 2011-03-26 14:15:05 +00:00
bq24022.h
consumer.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2011-10-28 14:25:01 -07:00
db8500-prcmu.h mach-ux500: voltage domain regulators for DB8500 2011-05-24 22:20:23 +02:00
driver.h regulator: Fix implicit use of notifier.h by driver.h 2011-10-31 19:32:16 -04:00
fixed.h regulator: Add 'start-up time' to fixed voltage regulators 2010-03-03 14:49:23 +00:00
gpio-regulator.h regulator: Add driver for gpio-controlled regulators 2011-10-09 12:36:21 +01:00
lp3971.h
lp3972.h Regulator: LP3972 PMIC regulator driver 2010-10-28 22:40:31 +01:00
machine.h regulator: Constify constraints name 2011-10-14 20:59:30 +01:00
max1586.h
max8649.h regulator: enable max8649 regulator driver 2010-03-03 14:49:24 +00:00
max8660.h
max8952.h MAX8952 PMIC Driver Initial Release 2010-10-28 22:40:31 +01:00
tps6507x.h regulator: tps6507x: allow driver to use DEFDCDC{2,3}_HIGH register 2010-07-28 15:09:26 +01:00
userspace-consumer.h