diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 07:33:59 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-27 18:18:19 -0400 |
| commit | a754a87ce8b17024358c1be8ee0232ef09a7055f (patch) | |
| tree | c0d4adee8f490828ca04cd45d6fbb13596d88322 /arch/arm/mach-s3c64xx | |
| parent | 70688056a8b4d610249716befe262a74fd123d90 (diff) | |
| parent | 22f8d055350066b4a87de4adea8c5213cac54534 (diff) | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards
The asoc branch that was already merged into v3.4 contains some
board-level changes that conflict with patches we already have
here, so pull in that branch to resolve the conflicts.
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-omap2/board-omap4panda.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: Amended fix for mismerge as reported by Kevin Hilman]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410-module.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c index f64c7b91f62e..b6a67728cc88 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c | |||
| @@ -120,6 +120,7 @@ static struct wm8962_pdata wm8962_pdata __initdata = { | |||
| 120 | 0x8000 | WM8962_GPIO_FN_DMICDAT, | 120 | 0x8000 | WM8962_GPIO_FN_DMICDAT, |
| 121 | WM8962_GPIO_FN_IRQ, /* Open drain mode */ | 121 | WM8962_GPIO_FN_IRQ, /* Open drain mode */ |
| 122 | }, | 122 | }, |
| 123 | .in4_dc_measure = true, | ||
| 123 | }; | 124 | }; |
| 124 | 125 | ||
| 125 | static struct wm9081_pdata wm9081_pdata __initdata = { | 126 | static struct wm9081_pdata wm9081_pdata __initdata = { |