summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2008-06-10 10:48:25 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-09 21:31:51 +0100
commitcabb352a6455c3550f157909196845f533b0f374 (patch)
tree81c1c512d3881800c862cb07a2cf31c8167e3649 /arch/arm
parent9f19d6382854d6b2d58cc364253779479e14facc (diff)
downloadblackbird-obmc-linux-cabb352a6455c3550f157909196845f533b0f374.tar.gz
blackbird-obmc-linux-cabb352a6455c3550f157909196845f533b0f374.zip
[ARM] 5084/1: zylonite: Register AC97 device
The Zylonite has an AC97 subsystem on it so register the AC97 controller device. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-pxa/zylonite.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c
index b13bb9385138..66b446ca273d 100644
--- a/arch/arm/mach-pxa/zylonite.c
+++ b/arch/arm/mach-pxa/zylonite.c
@@ -23,6 +23,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/hardware.h>
+#include <asm/arch/audio.h>
#include <asm/arch/gpio.h>
#include <asm/arch/pxafb.h>
#include <asm/arch/zylonite.h>
@@ -337,6 +338,7 @@ static void __init zylonite_init(void)
smc91x_resources[1].end = gpio_to_irq(gpio_eth_irq);
platform_device_register(&smc91x_device);
+ pxa_set_ac97_info(NULL);
zylonite_init_lcd();
zylonite_init_mmc();
zylonite_init_keypad();
OpenPOWER on IntegriCloud