* [PATCH v2 1/6] ARM: tegra: do not hide dma declarations
@ 2012-03-02 20:58 Alan Ott
2012-03-04 18:35 ` Olof Johansson
2012-04-16 18:48 ` Stephen Warren
0 siblings, 2 replies; 4+ messages in thread
From: Alan Ott @ 2012-03-02 20:58 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
The declarations are actually required for the device
definitions, and are still valid even if the dma controller
is disabled:
arch/arm/mach-tegra/devices.c:559:12: error: 'TEGRA_DMA_REQ_SEL_I2S_1' undeclared here (not in a function)
arch/arm/mach-tegra/devices.c:577:12: error: 'TEGRA_DMA_REQ_SEL_I2S2_1' undeclared here (not in a function)
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alan Ott <alan@signal11.us>
---
arch/arm/mach-tegra/include/mach/dma.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-tegra/include/mach/dma.h b/arch/arm/mach-tegra/include/mach/dma.h
index 3c93390..9077092 100644
--- a/arch/arm/mach-tegra/include/mach/dma.h
+++ b/arch/arm/mach-tegra/include/mach/dma.h
@@ -51,8 +51,6 @@
#define TEGRA_DMA_REQ_SEL_OWR 25
#define TEGRA_DMA_REQ_SEL_INVALID 31
-#if defined(CONFIG_TEGRA_SYSTEM_DMA)
-
struct tegra_dma_req;
struct tegra_dma_channel;
@@ -151,5 +149,3 @@ void tegra_dma_free_channel(struct tegra_dma_channel *ch);
int __init tegra_dma_init(void);
#endif
-
-#endif
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 1/6] ARM: tegra: do not hide dma declarations
2012-03-02 20:58 [PATCH v2 1/6] ARM: tegra: do not hide dma declarations Alan Ott
@ 2012-03-04 18:35 ` Olof Johansson
2012-03-04 19:00 ` Olof Johansson
2012-04-16 18:48 ` Stephen Warren
1 sibling, 1 reply; 4+ messages in thread
From: Olof Johansson @ 2012-03-04 18:35 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Mar 02, 2012 at 03:58:23PM -0500, Alan Ott wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The declarations are actually required for the device
> definitions, and are still valid even if the dma controller
> is disabled:
>
> arch/arm/mach-tegra/devices.c:559:12: error: 'TEGRA_DMA_REQ_SEL_I2S_1' undeclared here (not in a function)
> arch/arm/mach-tegra/devices.c:577:12: error: 'TEGRA_DMA_REQ_SEL_I2S2_1' undeclared here (not in a function)
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Alan Ott <alan@signal11.us>
Thanks, applied to cleanups-and-fixes for 3.4.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/6] ARM: tegra: do not hide dma declarations
2012-03-04 18:35 ` Olof Johansson
@ 2012-03-04 19:00 ` Olof Johansson
0 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2012-03-04 19:00 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Mar 4, 2012 at 10:35 AM, Olof Johansson <olof@lixom.net> wrote:
> On Fri, Mar 02, 2012 at 03:58:23PM -0500, Alan Ott wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> The declarations are actually required for the device
>> definitions, and are still valid even if the dma controller
>> is disabled:
>>
>> arch/arm/mach-tegra/devices.c:559:12: error: 'TEGRA_DMA_REQ_SEL_I2S_1' undeclared here (not in a function)
>> arch/arm/mach-tegra/devices.c:577:12: error: 'TEGRA_DMA_REQ_SEL_I2S2_1' undeclared here (not in a function)
>>
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> Signed-off-by: Alan Ott <alan@signal11.us>
>
> Thanks, applied to cleanups-and-fixes for 3.4.
Oh, a corresponding fix for this is already in mainline, so I dropped
it again (noticed due to conflicts).
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/6] ARM: tegra: do not hide dma declarations
2012-03-02 20:58 [PATCH v2 1/6] ARM: tegra: do not hide dma declarations Alan Ott
2012-03-04 18:35 ` Olof Johansson
@ 2012-04-16 18:48 ` Stephen Warren
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Warren @ 2012-04-16 18:48 UTC (permalink / raw)
To: linux-arm-kernel
On 03/02/2012 01:58 PM, Alan Ott wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The declarations are actually required for the device
> definitions, and are still valid even if the dma controller
> is disabled:
>
> arch/arm/mach-tegra/devices.c:559:12: error: 'TEGRA_DMA_REQ_SEL_I2S_1' undeclared here (not in a function)
> arch/arm/mach-tegra/devices.c:577:12: error: 'TEGRA_DMA_REQ_SEL_I2S2_1' undeclared here (not in a function)
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Alan Ott <alan@signal11.us>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-16 18:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-02 20:58 [PATCH v2 1/6] ARM: tegra: do not hide dma declarations Alan Ott
2012-03-04 18:35 ` Olof Johansson
2012-03-04 19:00 ` Olof Johansson
2012-04-16 18:48 ` Stephen Warren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox