diff options
author | Andrew Victor <linux@maxim.org.za> | 2009-09-22 05:47:50 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:28 -0400 |
commit | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (patch) | |
tree | 9245114aabaa107b845da58789f73cca3cc15cf4 /arch/arm/mach-at91 | |
parent | 2003b7af259611312ea132da1f5006ae0b8e47d7 (diff) |
ARM: 5719/1: [AT91] Fix AC97 breakage
Fix AC97 build breakage with converting to the shared AT91/AVR32 AC97 driver:
struct atmel_ac97_data -> struct ac97c_platform_data
CONFIG_SND_AT91_AC97 -> CONFIG_SND_ATMEL_AC97C
Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/at91cap9_devices.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-cap9adk.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-neocore926.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index 412aa49ad2fb..d1f775e86353 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c | |||
@@ -771,9 +771,9 @@ void __init at91_add_device_pwm(u32 mask) {} | |||
771 | * AC97 | 771 | * AC97 |
772 | * -------------------------------------------------------------------- */ | 772 | * -------------------------------------------------------------------- */ |
773 | 773 | ||
774 | #if defined(CONFIG_SND_AT91_AC97) || defined(CONFIG_SND_AT91_AC97_MODULE) | 774 | #if defined(CONFIG_SND_ATMEL_AC97C) || defined(CONFIG_SND_ATMEL_AC97C_MODULE) |
775 | static u64 ac97_dmamask = DMA_BIT_MASK(32); | 775 | static u64 ac97_dmamask = DMA_BIT_MASK(32); |
776 | static struct atmel_ac97_data ac97_data; | 776 | static struct ac97c_platform_data ac97_data; |
777 | 777 | ||
778 | static struct resource ac97_resources[] = { | 778 | static struct resource ac97_resources[] = { |
779 | [0] = { | 779 | [0] = { |
@@ -789,7 +789,7 @@ static struct resource ac97_resources[] = { | |||
789 | }; | 789 | }; |
790 | 790 | ||
791 | static struct platform_device at91cap9_ac97_device = { | 791 | static struct platform_device at91cap9_ac97_device = { |
792 | .name = "ac97c", | 792 | .name = "atmel_ac97c", |
793 | .id = 1, | 793 | .id = 1, |
794 | .dev = { | 794 | .dev = { |
795 | .dma_mask = &ac97_dmamask, | 795 | .dma_mask = &ac97_dmamask, |
@@ -800,7 +800,7 @@ static struct platform_device at91cap9_ac97_device = { | |||
800 | .num_resources = ARRAY_SIZE(ac97_resources), | 800 | .num_resources = ARRAY_SIZE(ac97_resources), |
801 | }; | 801 | }; |
802 | 802 | ||
803 | void __init at91_add_device_ac97(struct atmel_ac97_data *data) | 803 | void __init at91_add_device_ac97(struct ac97c_platform_data *data) |
804 | { | 804 | { |
805 | if (!data) | 805 | if (!data) |
806 | return; | 806 | return; |
@@ -818,7 +818,7 @@ void __init at91_add_device_ac97(struct atmel_ac97_data *data) | |||
818 | platform_device_register(&at91cap9_ac97_device); | 818 | platform_device_register(&at91cap9_ac97_device); |
819 | } | 819 | } |
820 | #else | 820 | #else |
821 | void __init at91_add_device_ac97(struct atmel_ac97_data *data) {} | 821 | void __init at91_add_device_ac97(struct ac97c_platform_data *data) {} |
822 | #endif | 822 | #endif |
823 | 823 | ||
824 | 824 | ||
diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c index 83a1a0fef47b..d6940870e403 100644 --- a/arch/arm/mach-at91/board-cap9adk.c +++ b/arch/arm/mach-at91/board-cap9adk.c | |||
@@ -364,7 +364,7 @@ static struct atmel_lcdfb_info __initdata cap9adk_lcdc_data; | |||
364 | /* | 364 | /* |
365 | * AC97 | 365 | * AC97 |
366 | */ | 366 | */ |
367 | static struct atmel_ac97_data cap9adk_ac97_data = { | 367 | static struct ac97c_platform_data cap9adk_ac97_data = { |
368 | // .reset_pin = ... not connected | 368 | // .reset_pin = ... not connected |
369 | }; | 369 | }; |
370 | 370 | ||
diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c index 9ba7ba2cc3b1..f78a55e5ad08 100644 --- a/arch/arm/mach-at91/board-neocore926.c +++ b/arch/arm/mach-at91/board-neocore926.c | |||
@@ -340,7 +340,7 @@ static void __init neocore926_add_device_buttons(void) {} | |||
340 | /* | 340 | /* |
341 | * AC97 | 341 | * AC97 |
342 | */ | 342 | */ |
343 | static struct atmel_ac97_data neocore926_ac97_data = { | 343 | static struct ac97c_platform_data neocore926_ac97_data = { |
344 | .reset_pin = AT91_PIN_PA13, | 344 | .reset_pin = AT91_PIN_PA13, |
345 | }; | 345 | }; |
346 | 346 | ||