diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 11:35:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 11:35:05 +1100 |
| commit | fded258e71f0c932acbabea4275bd8d0c7d11e3e (patch) | |
| tree | 024c3187753fd419a693ae285970c5a04aaaa044 /arch/arm | |
| parent | 894905011cb47cc0546e116fab91c7890e6fbcac (diff) | |
| parent | 51d0a223278a7f0c63472fa1353ab73eb77a5bf0 (diff) | |
Merge remote-tracking branch 'sound-asoc/for-next'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c64xx/dev-audio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c index a3f39dd114f9..cb953e238b2a 100644 --- a/arch/arm/mach-s3c64xx/dev-audio.c +++ b/arch/arm/mach-s3c64xx/dev-audio.c @@ -97,9 +97,7 @@ static struct resource s3c64xx_iisv4_resource[] = { static struct s3c_audio_pdata i2sv4_pdata = { .cfg_gpio = s3c64xx_i2s_cfg_gpio, .type = { - .i2s = { - .quirks = QUIRK_PRI_6CHAN, - }, + .quirks = QUIRK_PRI_6CHAN, }, }; |