Commit abffae64 authored by Sachin Kamat's avatar Sachin Kamat Committed by Mark Brown

ASoC: samsung: Fix build regressions due to gpio re-org

Recent changes through commits c67d0f29 ("ARM: s3c24xx: get rid
of custom <mach/gpio.h>"), b0161caa ("ARM: S3C[24|64]xx: move includes
back under <mach/> scope"), 36437412 ("ARM: s3c24xx: explicit
dependency on <plat/gpio-cfg.h>") and 41c3548e ("ARM: s3c64xx: get rid
of custom <mach/gpio.h>") caused build regressions due to broken
dependencies. Fix the following errors by including the necessary header
files explicitly:

sound/soc/samsung/h1940_uda1380.c:56:3: error: implicit declaration of function ‘S3C2410_GPG’
sound/soc/samsung/h1940_uda1380.c:149:18: error: ‘S3C_GPIO_END’ undeclared (first use in this function)
sound/soc/samsung/h1940_uda1380.c:234:21: error: ‘S3C_GPIO_END’ undeclared (first use in this function)
sound/soc/samsung/h1940_uda1380.c:270:12: error: ‘S3C_GPIO_END’ undeclared (first use in this function)
sound/soc/samsung/neo1973_wm8753.c:239:2: error: implicit declaration of function ‘S3C2410_GPJ’
sound/soc/samsung/rx1950_uda1380.c:67:3: error: implicit declaration of function ‘S3C2410_GPG’
sound/soc/samsung/s3c2412-i2s.c:86:2: error: implicit declaration of function ‘s3c_gpio_cfgall_range’
sound/soc/samsung/s3c2412-i2s.c:86:2: error: implicit declaration of function ‘S3C2410_GPE’
sound/soc/samsung/s3c2412-i2s.c:86:2: error: implicit declaration of function ‘S3C_GPIO_SFN’
sound/soc/samsung/s3c2412-i2s.c:87:10: error: ‘S3C_GPIO_PULL_NONE’ undeclared
sound/soc/samsung/s3c24xx-i2s.c:394:2: error: implicit declaration of function ‘s3c_gpio_cfgall_range’
sound/soc/samsung/s3c24xx-i2s.c:394:2: error: implicit declaration of function ‘S3C2410_GPE’
sound/soc/samsung/s3c24xx-i2s.c:394:2: error: implicit declaration of function ‘S3C_GPIO_SFN’
sound/soc/samsung/s3c24xx-i2s.c:395:10: error: ‘S3C_GPIO_PULL_NONE’ undeclared
sound/soc/samsung/smartq_wm8987.c:112:3: error: implicit declaration of function ‘S3C64XX_GPL’
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 7552f34a
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "regs-iis.h" #include "regs-iis.h"
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/gpio-samsung.h>
#include "s3c24xx-i2s.h" #include "s3c24xx-i2s.h"
static unsigned int rates[] = { static unsigned int rates[] = {
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <mach/gpio-samsung.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "regs-iis.h" #include "regs-iis.h"
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/jack.h> #include <sound/jack.h>
#include <mach/gpio-samsung.h>
#include "regs-iis.h" #include "regs-iis.h"
#include <asm/mach-types.h> #include <asm/mach-types.h>
......
...@@ -26,6 +26,8 @@ ...@@ -26,6 +26,8 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <mach/gpio-samsung.h>
#include <plat/gpio-cfg.h>
#include "dma.h" #include "dma.h"
#include "regs-i2s-v2.h" #include "regs-i2s-v2.h"
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <mach/dma.h> #include <mach/dma.h>
#include <mach/gpio-samsung.h>
#include <plat/gpio-cfg.h>
#include "regs-iis.h" #include "regs-iis.h"
#include "dma.h" #include "dma.h"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/jack.h> #include <sound/jack.h>
#include <mach/gpio-samsung.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "i2s.h" #include "i2s.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment