1
0
Fork 0
alistair23-linux/include/sound
Linus Torvalds ba1eb95cf3 Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
  x86: headers cleanup - setup.h
  emu101k1.h: fix duplicate include of <linux/types.h>
  compiler-gcc4: conditionalize #error on __KERNEL__
  remove __KERNEL_STRICT_NAMES
  make netfilter use strict integer types
  make drm headers use strict integer types
  make MTD headers use strict integer types
  make most exported headers use strict integer types
  make exported headers use strict posix types
  unconditionally include asm/types.h from linux/types.h
  make linux/types.h as assembly safe
  Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
  headers_check fix cleanup: linux/reiserfs_fs.h
  headers_check fix cleanup: linux/nubus.h
  headers_check fix cleanup: linux/coda_psdev.h
  headers_check fix: x86, setup.h
  headers_check fix: x86, prctl.h
  headers_check fix: linux/reinserfs_fs.h
  headers_check fix: linux/socket.h
  headers_check fix: linux/nubus.h
  ...

Manually fix trivial conflicts in:
	include/linux/netfilter/xt_limit.h
	include/linux/netfilter/xt_statistic.h
2009-03-26 16:11:41 -07:00
..
Kbuild [HEADERS] One line per header in Kbuild files to reduce conflicts 2006-09-19 12:43:58 +01:00
ac97_codec.h ALSA: cs5535audio: stick AD1888 bitshift values into a header file 2008-12-10 17:14:36 +01:00
ad1816a.h ALSA: ad1816a: enable hardware timer 2009-01-21 15:12:40 +01:00
ad1843.h ALSA: ALSA driver for SGI O2 audio board 2008-07-14 09:01:02 +02:00
ak4xxx-adda.h [ALSA] some fixes and cleanup for ICE1724 cards 2008-04-24 12:00:25 +02:00
ak4114.h [ALSA] some fixes and cleanup for ICE1724 cards 2008-04-24 12:00:25 +02:00
ak4117.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
ak4531_codec.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
asequencer.h [ALSA] Remove sequencer instrument layer 2008-01-31 17:29:13 +01:00
asound.h Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-03-26 16:11:41 -07:00
asound_fm.h [ALSA] opl3 - Use hwdep for patch loading 2008-01-31 17:29:13 +01:00
asoundef.h ALSA: IEC958 definition for consumer status channel update 2008-08-01 13:13:13 +02:00
atmel-abdac.h ALSA: Add ALSA driver for Atmel Audio Bitstream DAC 2009-02-05 15:08:48 +01:00
atmel-ac97c.h ALSA: Add ALSA driver for Atmel AC97 controller 2009-02-05 15:08:51 +01:00
control.h ALSA: Add kernel-doc comments to vmaster stuff 2009-03-09 15:10:01 +01:00
core.h Merge branch 'topic/ctl-list-cleanup' into for-linus 2009-03-24 00:35:45 +01:00
cs46xx.h [ALSA] sound: remove dead config symbol from sound code 2008-01-31 17:29:21 +01:00
cs46xx_dsp_scb_types.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
cs46xx_dsp_spos.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
cs46xx_dsp_task_types.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
cs4231-regs.h ALSA: opti93x: add support for Opti93x codec in cs4231-lib 2008-06-13 16:47:33 +02:00
cs8403.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
cs8427.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
driver.h [ALSA] Remove sound/driver.h 2008-01-31 17:29:48 +01:00
emu10k1.h emu101k1.h: fix duplicate include of <linux/types.h> 2009-03-26 18:14:24 +01:00
emu10k1_synth.h [ALSA] Remove xxx_t typedefs: PCI emu10k1 2006-01-03 12:18:47 +01:00
emu8000.h [ALSA] Remove xxx_t typedefs: ISA SB8/SB16/SBAWE 2006-01-03 12:18:25 +01:00
emu8000_reg.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
emux_legacy.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
emux_synth.h [ALSA] semaphore -> mutex (driver part) 2006-03-22 10:24:57 +01:00
es1688.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
gus.h [ALSA] Remove sequencer instrument layer 2008-01-31 17:29:13 +01:00
hda_hwdep.h [ALSA] hda-intel - Add hwdep interface 2007-10-16 15:58:10 +02:00
hdsp.h headers_check fix: sound/hdsp.h 2009-01-31 00:13:56 +05:30
hdspm.h [ALSA] hdspm - Coding style fixes 2007-10-16 15:58:10 +02:00
hwdep.h ALSA: hwdep - Fix coding style 2009-02-05 09:17:50 +01:00
i2c.h [ALSA] semaphore -> mutex (driver part) 2006-03-22 10:24:57 +01:00
info.h ALSA: include/sound/info.h - coding style changed 2008-11-12 17:07:52 +01:00
initval.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
jack.h ALSA: Add support for video out to the jack reporting API 2009-01-07 10:55:18 +00:00
l3.h ASoC: UDA134x codec driver 2008-11-17 11:45:39 +00:00
memalloc.h Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2008-10-11 12:39:35 -07:00
minors.h ALSA: Fix limit of 8 PCM devices in SNDRV_CTL_IOCTL_PCM_NEXT_DEVICE 2008-08-01 13:37:15 +02:00
mixer_oss.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
mpu401.h [ALSA] Add MPU401_INFO_NO_ACK bitflag 2008-04-29 19:01:56 +02:00
opl3.h [ALSA] opl3 - Fix compilation without sequencer support 2008-02-22 14:20:08 -08:00
opl4.h [ALSA] Remove xxx_t typedefs: OPL4 2006-01-03 12:18:06 +01:00
pcm-indirect.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
pcm.h Merge branch 'topic/misc' into for-linus 2009-03-24 00:35:50 +01:00
pcm_oss.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
pcm_params.h [ALSA] Move OSS-specific hw_params helper to snd-pcm-oss module 2006-06-22 21:33:05 +02:00
pt2258.h [ALSA] Enable the analog loopback of the Revolution 5.1 2007-02-09 09:00:05 +01:00
pxa2xx-lib.h ASoC: Allow choice of ac97 gpio reset line 2009-03-15 20:20:37 +00:00
rawmidi.h ALSA: rawmidi - Refactor rawmidi open/close codes 2009-03-09 15:17:23 +01:00
s3c24xx_uda134x.h ASoC: Machine driver for for s3c24xx with uda134x 2008-11-17 11:45:53 +00:00
sb.h ALSA: ALS4000, slight mixer improvements 2009-02-23 07:47:52 +01:00
sb16_csp.h [ALSA] sb16: add request_firmware() 2007-02-09 09:01:14 +01:00
seq_device.h [ALSA] Remove xxx_t typedefs: Sequencer 2006-01-03 12:17:52 +01:00
seq_kernel.h ALSA: remove CONFIG_KMOD from sound 2008-07-10 09:32:58 +02:00
seq_midi_emul.h [ALSA] Remove xxx_t typedefs: Sequencer 2006-01-03 12:17:52 +01:00
seq_midi_event.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
seq_oss.h [ALSA] Remove xxx_t typedefs: Sequencer OSS-emulation 2006-01-03 12:17:57 +01:00
seq_oss_legacy.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
seq_virmidi.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
sfnt_info.h ALSA: Use define for ioctl definitions 2009-03-11 09:55:03 +01:00
snd_wavefront.h ALSA: wss_lib: rename cs4231.h into wss.h 2008-08-06 15:39:47 +02:00
soc-dai.h ASoC: make ops a pointer in 'struct snd_soc_dai' 2009-03-04 22:29:47 +00:00
soc-dapm.h ASoC: Add SND_SOC_DAPM_PIN_SWITCH controls for exposing DAPM pins 2009-02-28 21:31:21 +00:00
soc-of-simple.h ALSA: ASoC: Make OpenFirmware helper include file conditional 2008-07-29 21:32:22 +02:00
soc.h ASoC: Add GPIO support for jack reporting interface 2009-03-04 14:47:38 +00:00
soundfont.h [ALSA] semaphore -> mutex (driver part) 2006-03-22 10:24:57 +01:00
sscape_ioctl.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tea575x-tuner.h V4L/DVB (10135): v4l2: introduce v4l2_file_operations. 2009-01-02 17:11:12 -02:00
tea6330t.h [ALSA] Remove xxx_t typedefs: I2C drivers 2006-01-03 12:18:08 +01:00
timer.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
tlv.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00
trident.h [ALSA] Remove sequencer instrument layer 2008-01-31 17:29:13 +01:00
uda134x.h ASoC: UDA134x codec driver 2008-11-17 11:45:39 +00:00
util_mem.h [ALSA] semaphore -> mutex (driver part) 2006-03-22 10:24:57 +01:00
version.h ALSA: Release v1.0.19 2009-01-19 14:41:33 +01:00
vx_core.h ALSA: Kill snd_assert() in other places 2008-08-13 11:46:40 +02:00
wavefront.h [PATCH] Eliminate __attribute__ ((packed)) warnings for gcc-4.1 2006-01-08 20:14:07 -08:00
wss.h ALSA: cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detection 2009-02-16 23:05:25 +01:00
ymfpci.h [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-16 16:51:18 +02:00