linux-stable/sound/soc/samsung
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
..
ac97.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
dma.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
dma.h ASoC: Samsung: Update DMA interface 2011-09-14 11:10:04 +05:30
goni_wm8994.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
h1940_uda1380.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
i2s-regs.h ASoC: SAMSUNG: Add idma related register definition 2011-06-26 12:05:23 +01:00
i2s.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
i2s.h
idma.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
idma.h ASoC: SAMSUNG: Add I2S0 internal dma driver 2011-08-12 09:48:26 +09:00
jive_wm8750.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
Kconfig ASoC: samsung: WM8994 depends on MFD_WM8994 2011-10-03 15:39:58 +01:00
ln2440sbc_alc650.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
Makefile ASoC: SAMSUNG: Add I2S0 internal dma driver 2011-08-12 09:48:26 +09:00
neo1973_wm8753.c ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
pcm.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
pcm.h ASoC: SAMSUNG: Move PCM specific definitions into pcm.c 2011-01-10 11:38:22 +00:00
regs-i2s-v2.h
rx1950_uda1380.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
s3c-i2s-v2.c ASoC: samsung: s3c-i2s-v2.c needs module.h 2011-10-03 21:34:12 +01:00
s3c-i2s-v2.h
s3c24xx-i2s.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
s3c24xx-i2s.h
s3c24xx_simtec.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
s3c24xx_simtec.h
s3c24xx_simtec_hermes.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
s3c24xx_simtec_tlv320aic23.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
s3c24xx_uda134x.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
s3c2412-i2s.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
s3c2412-i2s.h
smartq_wm8987.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
smdk2443_wm9710.c ASoC: SAMSUNG: Clean-up header includes 2011-01-11 11:28:33 +00:00
smdk_spdif.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
smdk_wm8580.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
smdk_wm8580pcm.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
smdk_wm8994.c ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers 2011-10-08 14:10:54 +01:00
smdk_wm8994pcm.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
smdk_wm9713.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
spdif.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
spdif.h
speyside.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
speyside_wm8962.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00