Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dma-bcm2708: Fix module compilation of CONFIG_DMA_BCM2708 #2057

Merged
merged 1 commit into from
Jun 6, 2017

Conversation

agherzan
Copy link
Contributor

@agherzan agherzan commented Jun 5, 2017

bcm2708-dmaengine.c defines functions like bcm_dma_start which are
defined as well in dma-bcm2708.h as inline versions when
CONFIG_DMA_BCM2708 is not defined. This works fine when
CONFIG_DMA_BCM2708 is built in, but when it is selected as module build
fails with redefinition errors because in the build system when
CONFIG_DMA_BCM2708 is selected as module, the macro becomes
CONFIG_DMA_BCM2708_MODULE.

This patch makes the header use CONFIG_DMA_BCM2708_MODULE too when
available.

Fixes #2056

Signed-off-by: Andrei Gherzan andrei@gherzan.com

bcm2708-dmaengine.c defines functions like bcm_dma_start which are
defined as well in dma-bcm2708.h as inline versions when
CONFIG_DMA_BCM2708 is not defined. This works fine when
CONFIG_DMA_BCM2708 is built in, but when it is selected as module build
fails with redefinition errors because in the build system when
CONFIG_DMA_BCM2708 is selected as module, the macro becomes
CONFIG_DMA_BCM2708_MODULE.

This patch makes the header use CONFIG_DMA_BCM2708_MODULE too when
available.

Fixes raspberrypi#2056

Signed-off-by: Andrei Gherzan <andrei@gherzan.com>
@pelwell pelwell merged commit 1613710 into raspberrypi:rpi-4.9.y Jun 6, 2017
@pelwell
Copy link
Contributor

pelwell commented Jun 6, 2017

Thanks.

@agherzan agherzan deleted the ag-rpi-4.9.y branch June 6, 2017 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants