aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-10-02 13:01:25 -0400
committerDavid Howells <dhowells@redhat.com>2012-10-02 13:01:25 -0400
commita1ce39288e6fbefdd8d607021d02384eb4a20b99 (patch)
treec72e67f0c9d828420788f9086a19df1b9a7e39ae /include/sound
parent760285e7e7ab282c25b5e90816f7c47000557f4f (diff)
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
Convert #include "..." to #include <path/...> in kernel system headers. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/ac97_codec.h6
-rw-r--r--include/sound/ad1816a.h6
-rw-r--r--include/sound/ak4531_codec.h4
-rw-r--r--include/sound/emu10k1_synth.h4
-rw-r--r--include/sound/emu8000.h4
-rw-r--r--include/sound/emux_legacy.h2
-rw-r--r--include/sound/emux_synth.h14
-rw-r--r--include/sound/es1688.h4
-rw-r--r--include/sound/gus.h10
-rw-r--r--include/sound/mpu401.h2
-rw-r--r--include/sound/pcm.h2
-rw-r--r--include/sound/rawmidi.h2
-rw-r--r--include/sound/sb.h4
-rw-r--r--include/sound/sb16_csp.h4
-rw-r--r--include/sound/seq_kernel.h2
-rw-r--r--include/sound/seq_midi_emul.h2
-rw-r--r--include/sound/seq_midi_event.h2
-rw-r--r--include/sound/seq_oss.h4
-rw-r--r--include/sound/seq_virmidi.h4
-rw-r--r--include/sound/snd_wavefront.h8
-rw-r--r--include/sound/soundfont.h4
-rw-r--r--include/sound/tea6330t.h2
-rw-r--r--include/sound/wss.h8
23 files changed, 52 insertions, 52 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 02cbb50225bb..fdeb8dceec0f 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -28,9 +28,9 @@
28#include <linux/bitops.h> 28#include <linux/bitops.h>
29#include <linux/device.h> 29#include <linux/device.h>
30#include <linux/workqueue.h> 30#include <linux/workqueue.h>
31#include "pcm.h" 31#include <sound/pcm.h>
32#include "control.h" 32#include <sound/control.h>
33#include "info.h" 33#include <sound/info.h>
34 34
35/* maximum number of devices on the AC97 bus */ 35/* maximum number of devices on the AC97 bus */
36#define AC97_BUS_MAX_DEVICES 4 36#define AC97_BUS_MAX_DEVICES 4
diff --git a/include/sound/ad1816a.h b/include/sound/ad1816a.h
index d010858c33c2..a7d8dc782e7c 100644
--- a/include/sound/ad1816a.h
+++ b/include/sound/ad1816a.h
@@ -20,9 +20,9 @@
20 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21*/ 21*/
22 22
23#include "control.h" 23#include <sound/control.h>
24#include "pcm.h" 24#include <sound/pcm.h>
25#include "timer.h" 25#include <sound/timer.h>
26 26
27#define AD1816A_REG(r) (chip->port + r) 27#define AD1816A_REG(r) (chip->port + r)
28 28
diff --git a/include/sound/ak4531_codec.h b/include/sound/ak4531_codec.h
index 575296cf7987..85ea86ea35b3 100644
--- a/include/sound/ak4531_codec.h
+++ b/include/sound/ak4531_codec.h
@@ -25,8 +25,8 @@
25 * 25 *
26 */ 26 */
27 27
28#include "info.h" 28#include <sound/info.h>
29#include "control.h" 29#include <sound/control.h>
30 30
31/* 31/*
32 * ASAHI KASEI - AK4531 codec 32 * ASAHI KASEI - AK4531 codec
diff --git a/include/sound/emu10k1_synth.h b/include/sound/emu10k1_synth.h
index 6ef61c420935..9f211e957bf9 100644
--- a/include/sound/emu10k1_synth.h
+++ b/include/sound/emu10k1_synth.h
@@ -20,8 +20,8 @@
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 */ 21 */
22 22
23#include "emu10k1.h" 23#include <sound/emu10k1.h>
24#include "emux_synth.h" 24#include <sound/emux_synth.h>
25 25
26/* sequencer device id */ 26/* sequencer device id */
27#define SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH "emu10k1-synth" 27#define SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH "emu10k1-synth"
diff --git a/include/sound/emu8000.h b/include/sound/emu8000.h
index c8f66bde6d95..c321302a9143 100644
--- a/include/sound/emu8000.h
+++ b/include/sound/emu8000.h
@@ -21,8 +21,8 @@
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22 */ 22 */
23 23
24#include "emux_synth.h" 24#include <sound/emux_synth.h>
25#include "seq_kernel.h" 25#include <sound/seq_kernel.h>
26 26
27/* 27/*
28 * Hardware parameters. 28 * Hardware parameters.
diff --git a/include/sound/emux_legacy.h b/include/sound/emux_legacy.h
index 6fe3da2a5e15..baf43fc24d39 100644
--- a/include/sound/emux_legacy.h
+++ b/include/sound/emux_legacy.h
@@ -22,7 +22,7 @@
22 * 22 *
23 */ 23 */
24 24
25#include "seq_oss_legacy.h" 25#include <sound/seq_oss_legacy.h>
26 26
27/* 27/*
28 * awe hardware controls 28 * awe hardware controls
diff --git a/include/sound/emux_synth.h b/include/sound/emux_synth.h
index d8cb51b86c20..fb81f3722b6a 100644
--- a/include/sound/emux_synth.h
+++ b/include/sound/emux_synth.h
@@ -21,15 +21,15 @@
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22 */ 22 */
23 23
24#include "seq_kernel.h" 24#include <sound/seq_kernel.h>
25#include "seq_device.h" 25#include <sound/seq_device.h>
26#include "soundfont.h" 26#include <sound/soundfont.h>
27#include "seq_midi_emul.h" 27#include <sound/seq_midi_emul.h>
28#ifdef CONFIG_SND_SEQUENCER_OSS 28#ifdef CONFIG_SND_SEQUENCER_OSS
29#include "seq_oss.h" 29#include <sound/seq_oss.h>
30#endif 30#endif
31#include "emux_legacy.h" 31#include <sound/emux_legacy.h>
32#include "seq_virmidi.h" 32#include <sound/seq_virmidi.h>
33 33
34/* 34/*
35 * compile flags 35 * compile flags
diff --git a/include/sound/es1688.h b/include/sound/es1688.h
index f752dd33dfaf..1d636a2d8896 100644
--- a/include/sound/es1688.h
+++ b/include/sound/es1688.h
@@ -22,8 +22,8 @@
22 * 22 *
23 */ 23 */
24 24
25#include "control.h" 25#include <sound/control.h>
26#include "pcm.h" 26#include <sound/pcm.h>
27#include <linux/interrupt.h> 27#include <linux/interrupt.h>
28 28
29#define ES1688_HW_AUTO 0x0000 29#define ES1688_HW_AUTO 0x0000
diff --git a/include/sound/gus.h b/include/sound/gus.h
index 841bb8df38c1..42905d811da7 100644
--- a/include/sound/gus.h
+++ b/include/sound/gus.h
@@ -22,11 +22,11 @@
22 * 22 *
23 */ 23 */
24 24
25#include "pcm.h" 25#include <sound/pcm.h>
26#include "rawmidi.h" 26#include <sound/rawmidi.h>
27#include "timer.h" 27#include <sound/timer.h>
28#include "seq_midi_emul.h" 28#include <sound/seq_midi_emul.h>
29#include "seq_device.h" 29#include <sound/seq_device.h>
30#include <asm/io.h> 30#include <asm/io.h>
31 31
32/* IO ports */ 32/* IO ports */
diff --git a/include/sound/mpu401.h b/include/sound/mpu401.h
index 20230db00ef1..e94209692513 100644
--- a/include/sound/mpu401.h
+++ b/include/sound/mpu401.h
@@ -22,7 +22,7 @@
22 * 22 *
23 */ 23 */
24 24
25#include "rawmidi.h" 25#include <sound/rawmidi.h>
26#include <linux/interrupt.h> 26#include <linux/interrupt.h>
27 27
28#define MPU401_HW_MPU401 1 /* native MPU401 */ 28#define MPU401_HW_MPU401 1 /* native MPU401 */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index cdca2ab1e711..d0711bc8c914 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -35,7 +35,7 @@
35#define snd_pcm_chip(pcm) ((pcm)->private_data) 35#define snd_pcm_chip(pcm) ((pcm)->private_data)
36 36
37#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE) 37#if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)
38#include "pcm_oss.h" 38#include <sound/pcm_oss.h>
39#endif 39#endif
40 40
41/* 41/*
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h
index 6b14359d9fed..adf0885153f3 100644
--- a/include/sound/rawmidi.h
+++ b/include/sound/rawmidi.h
@@ -30,7 +30,7 @@
30#include <linux/workqueue.h> 30#include <linux/workqueue.h>
31 31
32#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) 32#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)
33#include "seq_device.h" 33#include <sound/seq_device.h>
34#endif 34#endif
35 35
36/* 36/*
diff --git a/include/sound/sb.h b/include/sound/sb.h
index 95353542256a..ba3960329646 100644
--- a/include/sound/sb.h
+++ b/include/sound/sb.h
@@ -22,8 +22,8 @@
22 * 22 *
23 */ 23 */
24 24
25#include "pcm.h" 25#include <sound/pcm.h>
26#include "rawmidi.h" 26#include <sound/rawmidi.h>
27#include <linux/interrupt.h> 27#include <linux/interrupt.h>
28#include <asm/io.h> 28#include <asm/io.h>
29 29
diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
index af1b49e982df..7e950560e591 100644
--- a/include/sound/sb16_csp.h
+++ b/include/sound/sb16_csp.h
@@ -119,8 +119,8 @@ struct snd_sb_csp_info {
119#define SNDRV_SB_CSP_IOCTL_RESTART _IO('H', 0x16) 119#define SNDRV_SB_CSP_IOCTL_RESTART _IO('H', 0x16)
120 120
121#ifdef __KERNEL__ 121#ifdef __KERNEL__
122#include "sb.h" 122#include <sound/sb.h>
123#include "hwdep.h" 123#include <sound/hwdep.h>
124#include <linux/firmware.h> 124#include <linux/firmware.h>
125 125
126struct snd_sb_csp; 126struct snd_sb_csp;
diff --git a/include/sound/seq_kernel.h b/include/sound/seq_kernel.h
index f352a98ce4f4..2398521f0998 100644
--- a/include/sound/seq_kernel.h
+++ b/include/sound/seq_kernel.h
@@ -22,7 +22,7 @@
22 * 22 *
23 */ 23 */
24#include <linux/time.h> 24#include <linux/time.h>
25#include "asequencer.h" 25#include <sound/asequencer.h>
26 26
27typedef struct snd_seq_real_time snd_seq_real_time_t; 27typedef struct snd_seq_real_time snd_seq_real_time_t;
28typedef union snd_seq_timestamp snd_seq_timestamp_t; 28typedef union snd_seq_timestamp snd_seq_timestamp_t;
diff --git a/include/sound/seq_midi_emul.h b/include/sound/seq_midi_emul.h
index d6c4615901b9..8139d8c191ed 100644
--- a/include/sound/seq_midi_emul.h
+++ b/include/sound/seq_midi_emul.h
@@ -22,7 +22,7 @@
22 * 22 *
23 */ 23 */
24 24
25#include "seq_kernel.h" 25#include <sound/seq_kernel.h>
26 26
27/* 27/*
28 * This structure is used to keep track of the current state on each 28 * This structure is used to keep track of the current state on each
diff --git a/include/sound/seq_midi_event.h b/include/sound/seq_midi_event.h
index 5efab8b29c57..e40f43e6fc7b 100644
--- a/include/sound/seq_midi_event.h
+++ b/include/sound/seq_midi_event.h
@@ -22,7 +22,7 @@
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23 */ 23 */
24 24
25#include "asequencer.h" 25#include <sound/asequencer.h>
26 26
27#define MAX_MIDI_EVENT_BUF 256 27#define MAX_MIDI_EVENT_BUF 256
28 28
diff --git a/include/sound/seq_oss.h b/include/sound/seq_oss.h
index 9b060bbd6e02..d0b27ec6f8b8 100644
--- a/include/sound/seq_oss.h
+++ b/include/sound/seq_oss.h
@@ -21,8 +21,8 @@
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22 */ 22 */
23 23
24#include "asequencer.h" 24#include <sound/asequencer.h>
25#include "seq_kernel.h" 25#include <sound/seq_kernel.h>
26 26
27/* 27/*
28 * argument structure for synthesizer operations 28 * argument structure for synthesizer operations
diff --git a/include/sound/seq_virmidi.h b/include/sound/seq_virmidi.h
index d888433a3096..a03acd0d398a 100644
--- a/include/sound/seq_virmidi.h
+++ b/include/sound/seq_virmidi.h
@@ -22,8 +22,8 @@
22 * 22 *
23 */ 23 */
24 24
25#include "rawmidi.h" 25#include <sound/rawmidi.h>
26#include "seq_midi_event.h" 26#include <sound/seq_midi_event.h>
27 27
28/* 28/*
29 * device file instance: 29 * device file instance:
diff --git a/include/sound/snd_wavefront.h b/include/sound/snd_wavefront.h
index fa149ca77e4b..35e94b3d1ec7 100644
--- a/include/sound/snd_wavefront.h
+++ b/include/sound/snd_wavefront.h
@@ -1,10 +1,10 @@
1#ifndef __SOUND_SND_WAVEFRONT_H__ 1#ifndef __SOUND_SND_WAVEFRONT_H__
2#define __SOUND_SND_WAVEFRONT_H__ 2#define __SOUND_SND_WAVEFRONT_H__
3 3
4#include "mpu401.h" 4#include <sound/mpu401.h>
5#include "hwdep.h" 5#include <sound/hwdep.h>
6#include "rawmidi.h" 6#include <sound/rawmidi.h>
7#include "wavefront.h" /* generic OSS/ALSA/user-level wavefront header */ 7#include <sound/wavefront.h> /* generic OSS/ALSA/user-level wavefront header */
8 8
9/* MIDI interface */ 9/* MIDI interface */
10 10
diff --git a/include/sound/soundfont.h b/include/sound/soundfont.h
index 679df0574066..7c93efdba90d 100644
--- a/include/sound/soundfont.h
+++ b/include/sound/soundfont.h
@@ -22,8 +22,8 @@
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23 */ 23 */
24 24
25#include "sfnt_info.h" 25#include <sound/sfnt_info.h>
26#include "util_mem.h" 26#include <sound/util_mem.h>
27 27
28#define SF_MAX_INSTRUMENTS 128 /* maximum instrument number */ 28#define SF_MAX_INSTRUMENTS 128 /* maximum instrument number */
29#define SF_MAX_PRESETS 256 /* drums are mapped from 128 to 256 */ 29#define SF_MAX_PRESETS 256 /* drums are mapped from 128 to 256 */
diff --git a/include/sound/tea6330t.h b/include/sound/tea6330t.h
index 51b282b76896..e6beec23d7f2 100644
--- a/include/sound/tea6330t.h
+++ b/include/sound/tea6330t.h
@@ -22,7 +22,7 @@
22 * 22 *
23 */ 23 */
24 24
25#include "i2c.h" /* generic i2c support */ 25#include <sound/i2c.h> /* generic i2c support */
26 26
27int snd_tea6330t_detect(struct snd_i2c_bus *bus, int equalizer); 27int snd_tea6330t_detect(struct snd_i2c_bus *bus, int equalizer);
28int snd_tea6330t_update_mixer(struct snd_card *card, struct snd_i2c_bus *bus, 28int snd_tea6330t_update_mixer(struct snd_card *card, struct snd_i2c_bus *bus,
diff --git a/include/sound/wss.h b/include/sound/wss.h
index fd01f22825cd..0c7f034f1e86 100644
--- a/include/sound/wss.h
+++ b/include/sound/wss.h
@@ -22,11 +22,11 @@
22 * 22 *
23 */ 23 */
24 24
25#include "control.h" 25#include <sound/control.h>
26#include "pcm.h" 26#include <sound/pcm.h>
27#include "timer.h" 27#include <sound/timer.h>
28 28
29#include "cs4231-regs.h" 29#include <sound/cs4231-regs.h>
30 30
31/* defines for codec.mode */ 31/* defines for codec.mode */
32 32