diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-07-02 16:37:05 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-07-03 08:23:09 +0200 |
commit | 81fcb170852d58d7ebd8101a8ef970c82056426e (patch) | |
tree | f28367c9e30f116efe445cd016d04a4d57cb0551 | |
parent | ALSA: pdaudiocf: Remove superfluous pm_message_t argument from suspend (diff) | |
download | linux-81fcb170852d58d7ebd8101a8ef970c82056426e.tar.xz linux-81fcb170852d58d7ebd8101a8ef970c82056426e.zip |
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>
-rw-r--r-- | sound/pci/cs46xx/cs46xx.c | 2 | ||||
-rw-r--r-- | sound/pci/cs46xx/cs46xx.h (renamed from include/sound/cs46xx.h) | 8 | ||||
-rw-r--r-- | sound/pci/cs46xx/cs46xx_dsp_scb_types.h (renamed from include/sound/cs46xx_dsp_scb_types.h) | 0 | ||||
-rw-r--r-- | sound/pci/cs46xx/cs46xx_dsp_spos.h (renamed from include/sound/cs46xx_dsp_spos.h) | 0 | ||||
-rw-r--r-- | sound/pci/cs46xx/cs46xx_dsp_task_types.h (renamed from include/sound/cs46xx_dsp_task_types.h) | 0 | ||||
-rw-r--r-- | sound/pci/cs46xx/cs46xx_lib.c | 2 | ||||
-rw-r--r-- | sound/pci/cs46xx/dsp_spos.c | 2 | ||||
-rw-r--r-- | sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 | ||||
-rw-r--r-- | sound/pci/trident/trident.c | 2 | ||||
-rw-r--r-- | sound/pci/trident/trident.h (renamed from include/sound/trident.h) | 8 | ||||
-rw-r--r-- | sound/pci/trident/trident_main.c | 2 | ||||
-rw-r--r-- | sound/pci/trident/trident_memory.c | 2 | ||||
-rw-r--r-- | sound/pci/ymfpci/ymfpci.c | 2 | ||||
-rw-r--r-- | sound/pci/ymfpci/ymfpci.h (renamed from include/sound/ymfpci.h) | 8 | ||||
-rw-r--r-- | sound/pci/ymfpci/ymfpci_main.c | 2 |
15 files changed, 21 insertions, 21 deletions
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c index 00e03bc9a762..1e007c736a8b 100644 --- a/sound/pci/cs46xx/cs46xx.c +++ b/sound/pci/cs46xx/cs46xx.c @@ -30,7 +30,7 @@ #include <linux/init.h> #include <linux/module.h> #include <sound/core.h> -#include <sound/cs46xx.h> +#include "cs46xx.h" #include <sound/initval.h> MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); diff --git a/include/sound/cs46xx.h b/sound/pci/cs46xx/cs46xx.h index 34a2dd1614fa..29d8a8da1ba7 100644 --- a/include/sound/cs46xx.h +++ b/sound/pci/cs46xx/cs46xx.h @@ -23,10 +23,10 @@ * */ -#include "pcm.h" -#include "pcm-indirect.h" -#include "rawmidi.h" -#include "ac97_codec.h" +#include <sound/pcm.h> +#include <sound/pcm-indirect.h> +#include <sound/rawmidi.h> +#include <sound/ac97_codec.h> #include "cs46xx_dsp_spos.h" /* diff --git a/include/sound/cs46xx_dsp_scb_types.h b/sound/pci/cs46xx/cs46xx_dsp_scb_types.h index 080857ad0ca2..080857ad0ca2 100644 --- a/include/sound/cs46xx_dsp_scb_types.h +++ b/sound/pci/cs46xx/cs46xx_dsp_scb_types.h diff --git a/include/sound/cs46xx_dsp_spos.h b/sound/pci/cs46xx/cs46xx_dsp_spos.h index 8008c59288a6..8008c59288a6 100644 --- a/include/sound/cs46xx_dsp_spos.h +++ b/sound/pci/cs46xx/cs46xx_dsp_spos.h diff --git a/include/sound/cs46xx_dsp_task_types.h b/sound/pci/cs46xx/cs46xx_dsp_task_types.h index 5cf920bfda27..5cf920bfda27 100644 --- a/include/sound/cs46xx_dsp_task_types.h +++ b/sound/pci/cs46xx/cs46xx_dsp_task_types.h diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c index 28b9747becc9..f75f5ffdfdfb 100644 --- a/sound/pci/cs46xx/cs46xx_lib.c +++ b/sound/pci/cs46xx/cs46xx_lib.c @@ -61,7 +61,7 @@ #include <sound/info.h> #include <sound/pcm.h> #include <sound/pcm_params.h> -#include <sound/cs46xx.h> +#include "cs46xx.h" #include <asm/io.h> diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c index e377287192aa..56fec0bc0efb 100644 --- a/sound/pci/cs46xx/dsp_spos.c +++ b/sound/pci/cs46xx/dsp_spos.c @@ -32,7 +32,7 @@ #include <sound/control.h> #include <sound/info.h> #include <sound/asoundef.h> -#include <sound/cs46xx.h> +#include "cs46xx.h" #include "cs46xx_lib.h" #include "dsp_spos.h" diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c index 00b148a10239..c2c695b07f8c 100644 --- a/sound/pci/cs46xx/dsp_spos_scb_lib.c +++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c @@ -31,7 +31,7 @@ #include <sound/core.h> #include <sound/control.h> #include <sound/info.h> -#include <sound/cs46xx.h> +#include "cs46xx.h" #include "cs46xx_lib.h" #include "dsp_spos.h" diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c index f61346a555bb..d36e6ca147e1 100644 --- a/sound/pci/trident/trident.c +++ b/sound/pci/trident/trident.c @@ -26,7 +26,7 @@ #include <linux/time.h> #include <linux/module.h> #include <sound/core.h> -#include <sound/trident.h> +#include "trident.h" #include <sound/initval.h> MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, <audio@tridentmicro.com>"); diff --git a/include/sound/trident.h b/sound/pci/trident/trident.h index 06f0478103db..5f110eb56e47 100644 --- a/include/sound/trident.h +++ b/sound/pci/trident/trident.h @@ -23,10 +23,10 @@ * */ -#include "pcm.h" -#include "mpu401.h" -#include "ac97_codec.h" -#include "util_mem.h" +#include <sound/pcm.h> +#include <sound/mpu401.h> +#include <sound/ac97_codec.h> +#include <sound/util_mem.h> #define TRIDENT_DEVICE_ID_DX ((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_DX) #define TRIDENT_DEVICE_ID_NX ((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_NX) diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index b4430c093bad..94011dcae731 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c @@ -41,7 +41,7 @@ #include <sound/info.h> #include <sound/control.h> #include <sound/tlv.h> -#include <sound/trident.h> +#include "trident.h" #include <sound/asoundef.h> #include <asm/io.h> diff --git a/sound/pci/trident/trident_memory.c b/sound/pci/trident/trident_memory.c index f9779e23fe57..3102a579660b 100644 --- a/sound/pci/trident/trident_memory.c +++ b/sound/pci/trident/trident_memory.c @@ -29,7 +29,7 @@ #include <linux/mutex.h> #include <sound/core.h> -#include <sound/trident.h> +#include "trident.h" /* page arguments of these two macros are Trident page (4096 bytes), not like * aligned pages in others diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index 7e20ddb9123a..4810356b97ba 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c @@ -24,7 +24,7 @@ #include <linux/time.h> #include <linux/module.h> #include <sound/core.h> -#include <sound/ymfpci.h> +#include "ymfpci.h" #include <sound/mpu401.h> #include <sound/opl3.h> #include <sound/initval.h> diff --git a/include/sound/ymfpci.h b/sound/pci/ymfpci/ymfpci.h index 238f118de6e1..bddc4052286b 100644 --- a/include/sound/ymfpci.h +++ b/sound/pci/ymfpci/ymfpci.h @@ -22,10 +22,10 @@ * */ -#include "pcm.h" -#include "rawmidi.h" -#include "ac97_codec.h" -#include "timer.h" +#include <sound/pcm.h> +#include <sound/rawmidi.h> +#include <sound/ac97_codec.h> +#include <sound/timer.h> #include <linux/gameport.h> /* diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index c706901d6ff6..62b23635b754 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c @@ -33,7 +33,7 @@ #include <sound/control.h> #include <sound/info.h> #include <sound/tlv.h> -#include <sound/ymfpci.h> +#include "ymfpci.h" #include <sound/asoundef.h> #include <sound/mpu401.h> |