From 5dc9becc6d92827b6d58b872db71837f7d8d4dae Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 5 Jul 2012 12:29:39 +0200 Subject: [PATCH] --- yaml --- r: 316668 b: refs/heads/master c: 1e7f07b5390b4bbf82fe017fcb46682dcf4ab1d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/siu.h | 1 - trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb07047c10e1..e54f8a523635 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d051dc79f8fd1854229178476db0534359a3704 +refs/heads/master: 1e7f07b5390b4bbf82fe017fcb46682dcf4ab1d0 diff --git a/trunk/arch/sh/include/asm/siu.h b/trunk/arch/sh/include/asm/siu.h index 1d95c78808d1..580b7ac228b7 100644 --- a/trunk/arch/sh/include/asm/siu.h +++ b/trunk/arch/sh/include/asm/siu.h @@ -14,7 +14,6 @@ struct device; struct siu_platform { - struct device *dma_dev; unsigned int dma_slave_tx_a; unsigned int dma_slave_rx_a; unsigned int dma_slave_tx_b; diff --git a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index 0f5a21907da6..65786c7f5ded 100644 --- a/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c @@ -512,7 +512,6 @@ static struct platform_device tmu2_device = { }; static struct siu_platform siu_platform_data = { - .dma_dev = &dma_device.dev, .dma_slave_tx_a = SHDMA_SLAVE_SIUA_TX, .dma_slave_rx_a = SHDMA_SLAVE_SIUA_RX, .dma_slave_tx_b = SHDMA_SLAVE_SIUB_TX,