diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 15:19:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-14 15:19:49 -0700 |
| commit | 4117b61f7200cc83d509ed226e4d8239e4d6044b (patch) | |
| tree | 29b324c9c1d3041f8c9bf9303d5c7cef921d0658 /arch | |
| parent | ef4cbee0b0d0f791bb593f99b702410f3c0efce6 (diff) | |
| parent | 2cef2d552f75b7feb7859d29a71388c020023872 (diff) | |
| download | blackbird-op-linux-4117b61f7200cc83d509ed226e4d8239e4d6044b.tar.gz blackbird-op-linux-4117b61f7200cc83d509ed226e4d8239e4d6044b.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index 923f6eb774c0..1f38033921e9 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, }; |
