diff options
author | Takashi Iwai | 2011-03-16 17:38:41 +0100 |
---|---|---|
committer | Takashi Iwai | 2011-03-16 17:38:41 +0100 |
commit | 27b92d4ff2be2359a21ff4acde5b63563ff720e2 (patch) | |
tree | 49691b22fe1318aa68d5ebdff74795f004f0cf8f /arch/sh/boards/mach-ecovec24 | |
parent | ALSA: firewire - msleep needs delay.h (diff) | |
parent | Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lr... (diff) | |
download | kernel-qcow2-linux-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.gz kernel-qcow2-linux-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.xz kernel-qcow2-linux-27b92d4ff2be2359a21ff4acde5b63563ff720e2.zip |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/sh/boards/mach-ecovec24')
-rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 701667acfd89..7bdb572ddf93 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -723,11 +723,7 @@ static struct platform_device camera_devices[] = { /* FSI */ static struct sh_fsi_platform_info fsi_info = { - .portb_flags = SH_FSI_BRS_INV | - SH_FSI_OUT_SLAVE_MODE | - SH_FSI_IN_SLAVE_MODE | - SH_FSI_OFMT(I2S) | - SH_FSI_IFMT(I2S), + .portb_flags = SH_FSI_BRS_INV, }; static struct resource fsi_resources[] = { |