diff --git a/[refs] b/[refs] index 1a14c4a12fca..c24f94630468 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 425d6940b967c874dd76f4e5b9c81e201b83bc3b +refs/heads/master: 76b80329177c4b4675b00256844804d09038e2ad diff --git a/trunk/arch/arm/mach-shmobile/board-kzm9g.c b/trunk/arch/arm/mach-shmobile/board-kzm9g.c index b056b7af9879..212c524d8265 100644 --- a/trunk/arch/arm/mach-shmobile/board-kzm9g.c +++ b/trunk/arch/arm/mach-shmobile/board-kzm9g.c @@ -470,6 +470,7 @@ static struct platform_device gpio_keys_device = { /* FSI-AK4648 */ static struct sh_fsi_platform_info fsi_info = { .port_a = { + .tx_id = SHDMA_SLAVE_FSI2A_TX, }, };