tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ALSA: Move some headers to local directories from include/sound

This is a bit clean up of public sound header directory.
Some header files in include/sound aren't really necessary to be
located there but can be moved to their local directories gracefully.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Takashi Iwai 81fcb170 2cb1331d

+21 -21
+4 -4
include/sound/cs46xx.h sound/pci/cs46xx/cs46xx.h
··· 23 23 * 24 24 */ 25 25 26 - #include "pcm.h" 27 - #include "pcm-indirect.h" 28 - #include "rawmidi.h" 29 - #include "ac97_codec.h" 26 + #include <sound/pcm.h> 27 + #include <sound/pcm-indirect.h> 28 + #include <sound/rawmidi.h> 29 + #include <sound/ac97_codec.h> 30 30 #include "cs46xx_dsp_spos.h" 31 31 32 32 /*
include/sound/cs46xx_dsp_scb_types.h sound/pci/cs46xx/cs46xx_dsp_scb_types.h
include/sound/cs46xx_dsp_spos.h sound/pci/cs46xx/cs46xx_dsp_spos.h
include/sound/cs46xx_dsp_task_types.h sound/pci/cs46xx/cs46xx_dsp_task_types.h
+4 -4
include/sound/trident.h sound/pci/trident/trident.h
··· 23 23 * 24 24 */ 25 25 26 - #include "pcm.h" 27 - #include "mpu401.h" 28 - #include "ac97_codec.h" 29 - #include "util_mem.h" 26 + #include <sound/pcm.h> 27 + #include <sound/mpu401.h> 28 + #include <sound/ac97_codec.h> 29 + #include <sound/util_mem.h> 30 30 31 31 #define TRIDENT_DEVICE_ID_DX ((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_DX) 32 32 #define TRIDENT_DEVICE_ID_NX ((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_NX)
+4 -4
include/sound/ymfpci.h sound/pci/ymfpci/ymfpci.h
··· 22 22 * 23 23 */ 24 24 25 - #include "pcm.h" 26 - #include "rawmidi.h" 27 - #include "ac97_codec.h" 28 - #include "timer.h" 25 + #include <sound/pcm.h> 26 + #include <sound/rawmidi.h> 27 + #include <sound/ac97_codec.h> 28 + #include <sound/timer.h> 29 29 #include <linux/gameport.h> 30 30 31 31 /*
+1 -1
sound/pci/cs46xx/cs46xx.c
··· 30 30 #include <linux/init.h> 31 31 #include <linux/module.h> 32 32 #include <sound/core.h> 33 - #include <sound/cs46xx.h> 33 + #include "cs46xx.h" 34 34 #include <sound/initval.h> 35 35 36 36 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
+1 -1
sound/pci/cs46xx/cs46xx_lib.c
··· 61 61 #include <sound/info.h> 62 62 #include <sound/pcm.h> 63 63 #include <sound/pcm_params.h> 64 - #include <sound/cs46xx.h> 64 + #include "cs46xx.h" 65 65 66 66 #include <asm/io.h> 67 67
+1 -1
sound/pci/cs46xx/dsp_spos.c
··· 32 32 #include <sound/control.h> 33 33 #include <sound/info.h> 34 34 #include <sound/asoundef.h> 35 - #include <sound/cs46xx.h> 35 + #include "cs46xx.h" 36 36 37 37 #include "cs46xx_lib.h" 38 38 #include "dsp_spos.h"
+1 -1
sound/pci/cs46xx/dsp_spos_scb_lib.c
··· 31 31 #include <sound/core.h> 32 32 #include <sound/control.h> 33 33 #include <sound/info.h> 34 - #include <sound/cs46xx.h> 34 + #include "cs46xx.h" 35 35 36 36 #include "cs46xx_lib.h" 37 37 #include "dsp_spos.h"
+1 -1
sound/pci/trident/trident.c
··· 26 26 #include <linux/time.h> 27 27 #include <linux/module.h> 28 28 #include <sound/core.h> 29 - #include <sound/trident.h> 29 + #include "trident.h" 30 30 #include <sound/initval.h> 31 31 32 32 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, <audio@tridentmicro.com>");
+1 -1
sound/pci/trident/trident_main.c
··· 41 41 #include <sound/info.h> 42 42 #include <sound/control.h> 43 43 #include <sound/tlv.h> 44 - #include <sound/trident.h> 44 + #include "trident.h" 45 45 #include <sound/asoundef.h> 46 46 47 47 #include <asm/io.h>
+1 -1
sound/pci/trident/trident_memory.c
··· 29 29 #include <linux/mutex.h> 30 30 31 31 #include <sound/core.h> 32 - #include <sound/trident.h> 32 + #include "trident.h" 33 33 34 34 /* page arguments of these two macros are Trident page (4096 bytes), not like 35 35 * aligned pages in others
+1 -1
sound/pci/ymfpci/ymfpci.c
··· 24 24 #include <linux/time.h> 25 25 #include <linux/module.h> 26 26 #include <sound/core.h> 27 - #include <sound/ymfpci.h> 27 + #include "ymfpci.h" 28 28 #include <sound/mpu401.h> 29 29 #include <sound/opl3.h> 30 30 #include <sound/initval.h>
+1 -1
sound/pci/ymfpci/ymfpci_main.c
··· 33 33 #include <sound/control.h> 34 34 #include <sound/info.h> 35 35 #include <sound/tlv.h> 36 - #include <sound/ymfpci.h> 36 + #include "ymfpci.h" 37 37 #include <sound/asoundef.h> 38 38 #include <sound/mpu401.h> 39 39