diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-23 09:47:56 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-10-23 12:43:42 -0400 |
commit | 888dcb7cb26fb85dfe3486d28a2431d69d3e8148 (patch) | |
tree | aad6f0dba4bdb63bc72280ed51a79f7dea284278 /sound/aoa/core | |
parent | 72474be62d6ec2e0337ff01ecbd737f9c5c242c7 (diff) |
ALSA: aoa: clean up file names
This cleans up the apple onboard audio driver filenames.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/aoa/core')
-rw-r--r-- | sound/aoa/core/Makefile | 8 | ||||
-rw-r--r-- | sound/aoa/core/alsa.c (renamed from sound/aoa/core/snd-aoa-alsa.c) | 4 | ||||
-rw-r--r-- | sound/aoa/core/alsa.h (renamed from sound/aoa/core/snd-aoa-alsa.h) | 0 | ||||
-rw-r--r-- | sound/aoa/core/core.c (renamed from sound/aoa/core/snd-aoa-core.c) | 2 | ||||
-rw-r--r-- | sound/aoa/core/gpio-feature.c (renamed from sound/aoa/core/snd-aoa-gpio-feature.c) | 2 | ||||
-rw-r--r-- | sound/aoa/core/gpio-pmf.c (renamed from sound/aoa/core/snd-aoa-gpio-pmf.c) | 0 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sound/aoa/core/Makefile b/sound/aoa/core/Makefile index 62dc7287f663..a1596e88c718 100644 --- a/sound/aoa/core/Makefile +++ b/sound/aoa/core/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | obj-$(CONFIG_SND_AOA) += snd-aoa.o | 1 | obj-$(CONFIG_SND_AOA) += snd-aoa.o |
2 | snd-aoa-objs := snd-aoa-core.o \ | 2 | snd-aoa-objs := core.o \ |
3 | snd-aoa-alsa.o \ | 3 | alsa.o \ |
4 | snd-aoa-gpio-pmf.o \ | 4 | gpio-pmf.o \ |
5 | snd-aoa-gpio-feature.o | 5 | gpio-feature.o |
diff --git a/sound/aoa/core/snd-aoa-alsa.c b/sound/aoa/core/alsa.c index 17fe689ed287..617850463582 100644 --- a/sound/aoa/core/snd-aoa-alsa.c +++ b/sound/aoa/core/alsa.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * GPL v2, can be found in COPYING. | 6 | * GPL v2, can be found in COPYING. |
7 | */ | 7 | */ |
8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
9 | #include "snd-aoa-alsa.h" | 9 | #include "alsa.h" |
10 | 10 | ||
11 | static int index = -1; | 11 | static int index = -1; |
12 | module_param(index, int, 0444); | 12 | module_param(index, int, 0444); |
@@ -64,7 +64,7 @@ int aoa_snd_device_new(snd_device_type_t type, | |||
64 | { | 64 | { |
65 | struct snd_card *card = aoa_get_card(); | 65 | struct snd_card *card = aoa_get_card(); |
66 | int err; | 66 | int err; |
67 | 67 | ||
68 | if (!card) return -ENOMEM; | 68 | if (!card) return -ENOMEM; |
69 | 69 | ||
70 | err = snd_device_new(card, type, device_data, ops); | 70 | err = snd_device_new(card, type, device_data, ops); |
diff --git a/sound/aoa/core/snd-aoa-alsa.h b/sound/aoa/core/alsa.h index 9669e4489cab..9669e4489cab 100644 --- a/sound/aoa/core/snd-aoa-alsa.h +++ b/sound/aoa/core/alsa.h | |||
diff --git a/sound/aoa/core/snd-aoa-core.c b/sound/aoa/core/core.c index 19fdae400687..10bec6c61382 100644 --- a/sound/aoa/core/snd-aoa-core.c +++ b/sound/aoa/core/core.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
11 | #include <linux/list.h> | 11 | #include <linux/list.h> |
12 | #include "../aoa.h" | 12 | #include "../aoa.h" |
13 | #include "snd-aoa-alsa.h" | 13 | #include "alsa.h" |
14 | 14 | ||
15 | MODULE_DESCRIPTION("Apple Onboard Audio Sound Driver"); | 15 | MODULE_DESCRIPTION("Apple Onboard Audio Sound Driver"); |
16 | MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>"); | 16 | MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>"); |
diff --git a/sound/aoa/core/snd-aoa-gpio-feature.c b/sound/aoa/core/gpio-feature.c index 805dcbff2257..c93ad5dec66b 100644 --- a/sound/aoa/core/snd-aoa-gpio-feature.c +++ b/sound/aoa/core/gpio-feature.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * GPL v2, can be found in COPYING. | 6 | * GPL v2, can be found in COPYING. |
7 | * | 7 | * |
8 | * This file contains the GPIO control routines for | 8 | * This file contains the GPIO control routines for |
9 | * direct (through feature calls) access to the GPIO | 9 | * direct (through feature calls) access to the GPIO |
10 | * registers. | 10 | * registers. |
11 | */ | 11 | */ |
diff --git a/sound/aoa/core/snd-aoa-gpio-pmf.c b/sound/aoa/core/gpio-pmf.c index 5ca2220eac7d..5ca2220eac7d 100644 --- a/sound/aoa/core/snd-aoa-gpio-pmf.c +++ b/sound/aoa/core/gpio-pmf.c | |||