From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
mach/hardware.h is needed on C source code side, not header. And struct davinci_vc is duplicated definition.
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- drivers/mfd/davinci_voicecodec.c | 1 + include/linux/mfd/davinci_voicecodec.h | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c index dff2f19..4d0a5f3 100644 --- a/drivers/mfd/davinci_voicecodec.c +++ b/drivers/mfd/davinci_voicecodec.c @@ -32,6 +32,7 @@ #include <sound/pcm.h>
#include <linux/mfd/davinci_voicecodec.h> +#include <mach/hardware.h>
static const struct regmap_config davinci_vc_regmap = { .reg_bits = 32, diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h index 8e1cdbe..2c0127c 100644 --- a/include/linux/mfd/davinci_voicecodec.h +++ b/include/linux/mfd/davinci_voicecodec.h @@ -28,8 +28,6 @@ #include <linux/mfd/core.h> #include <linux/platform_data/edma.h>
-#include <mach/hardware.h> - struct regmap;
/* @@ -99,8 +97,6 @@ struct davinci_vcif { dma_addr_t dma_rx_addr; };
-struct davinci_vc; - struct davinci_vc { /* Device data */ struct device *dev;