linux/sound/usb
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
..
6fire sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
caiaq ALSA: snd-usb-caiaq: Add support for Maschine 2011-10-13 08:16:46 +02:00
misc ALSA: ua101: fix crash when unplugging 2011-11-06 11:21:42 +01:00
usx2y sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
card.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
card.h ALSA: usb: refine delay information with USB frame counter 2011-09-12 10:30:20 +02:00
clock.c ALSA: usb-audio: increase control transfer timeout 2011-09-27 09:21:48 +02:00
clock.h ALSA: usb-audio: simplify control interface access 2010-06-23 16:10:23 +02:00
debug.h ALSA: usb-audio: make hwc_debug a noop in case HW_CONST_DEBUG is not set 2011-05-18 11:44:35 +02:00
endpoint.c ALSA: snd-usb: move code from urb.c to endpoint.c 2011-09-14 17:07:03 +02:00
endpoint.h ALSA: snd-usb: move code from urb.c to endpoint.c 2011-09-14 17:07:03 +02:00
format.c ALSA: usb-audio: increase control transfer timeout 2011-09-27 09:21:48 +02:00
format.h
helper.c ALSA: usb-audio: increase control transfer timeout 2011-09-27 09:21:48 +02:00
helper.h ALSA: usb-audio: increase control transfer timeout 2011-09-27 09:21:48 +02:00
Kconfig ALSA: snd-usb-caiaq: Add support for Maschine 2011-10-13 08:16:46 +02:00
Makefile ALSA: snd-usb: move code from urb.c to endpoint.c 2011-09-14 17:07:03 +02:00
midi.c sound: Add module.h to the previously silent sound users 2011-10-31 19:31:21 -04:00
midi.h
mixer_maps.c
mixer_quirks.c ALSA: usb-audio: increase control transfer timeout 2011-09-27 09:21:48 +02:00
mixer_quirks.h
mixer.c ALSA: usb-audio - Fix possible access over audio_feature_info[] array 2011-10-13 08:19:09 +02:00
mixer.h ALSA: snd-usb: operate on given mixer interface only 2011-08-04 16:24:10 +02:00
pcm.c ALSA: usb-audio: increase control transfer timeout 2011-09-27 09:21:48 +02:00
pcm.h ALSA: usb: refine delay information with USB frame counter 2011-09-12 10:30:20 +02:00
power.h ALSA: usbaudio: implement USB autosuspend 2011-03-11 14:59:29 +01:00
proc.c ALSA: usb-audio: automatically detect feedback format 2010-10-27 09:17:41 +02:00
proc.h
quirks-table.h ALSA: usb-audio: Added support for Roland UM-ONE midi-usb interface 2011-09-16 08:31:45 +02:00
quirks.c ALSA: usb-audio: increase control transfer timeout 2011-09-27 09:21:48 +02:00
quirks.h
stream.c ALSA: snd-usb: move code from urb.c to endpoint.c 2011-09-14 17:07:03 +02:00
stream.h ALSA: snd-usb: re-order code 2011-09-14 17:07:02 +02:00
usbaudio.h ALSA: usb-audio: add Starr Labs USB MIDI support 2011-08-26 14:12:34 +02:00