summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-14 22:19:49 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-14 22:19:49 (GMT)
commit4117b61f7200cc83d509ed226e4d8239e4d6044b (patch)
tree29b324c9c1d3041f8c9bf9303d5c7cef921d0658
parentef4cbee0b0d0f791bb593f99b702410f3c0efce6 (diff)
parent2cef2d552f75b7feb7859d29a71388c020023872 (diff)
downloadlinux-fsl-qoriq-4117b61f7200cc83d509ed226e4d8239e4d6044b.tar.xz
Merge master.kernel.org:/home/rmk/linux-2.6-arm
-rw-r--r--arch/arm/mach-pxa/lubbock.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 923f6eb..1f38033 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -146,6 +146,11 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = {
// no D+ pullup; lubbock can't connect/disconnect in software
};
+static struct platform_device lub_audio_device = {
+ .name = "pxa2xx-ac97",
+ .id = -1,
+};
+
static struct resource sa1111_resources[] = {
[0] = {
.start = 0x10000000,
@@ -195,6 +200,7 @@ static struct platform_device smc91x_device = {
static struct platform_device *devices[] __initdata = {
&sa1111_device,
+ &lub_audio_device,
&smc91x_device,
};