diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-08-18 19:41:12 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-08-18 19:41:12 +0300 |
| commit | f594d0b9b34aeb8e3ffa524eaa8a4085afb56d22 (patch) | |
| tree | 7ef81ad042bcfe78dc0f41e05cebfdbc268871c4 /arch/arm/mach-davinci/board-dm644x-evm.c | |
| parent | b3830e8d478cd9fe33e820425ce431c8ef280967 (diff) | |
| parent | 7b0501b1e7cddd32b265178e32d332bdfbb532d4 (diff) | |
| download | linux-f594d0b9b34aeb8e3ffa524eaa8a4085afb56d22.tar.xz | |
Merge branch 'x86/urgent' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-davinci/board-dm644x-evm.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-dm644x-evm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index ab47b8eb1b15..521e40977265 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -264,8 +264,6 @@ static struct platform_device rtc_dev = { .id = -1, }; -static struct snd_platform_data dm644x_evm_snd_data; - /*----------------------------------------------------------------------*/ #ifdef CONFIG_I2C /* @@ -799,7 +797,7 @@ static __init void davinci_evm_init(void) dm644x_init_video(&dm644xevm_capture_cfg, &dm644xevm_display_cfg); davinci_serial_init(dm644x_serial_device); - dm644x_init_asp(&dm644x_evm_snd_data); + dm644x_init_asp(); /* irlml6401 switches over 1A, in under 8 msec */ davinci_setup_usb(1000, 8); |