summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-07-15 18:29:47 -0700
committerOlof Johansson <olof@lixom.net>2014-07-15 18:29:47 -0700
commitcb6a0fd4e4e15a65bb14b142089990df2def038e (patch)
treed1d96a0a4fe13dbc6df030c45bdacd6828dcd943 /sound
parente1adcba9c8f6453b1aefababce6810a6866a557c (diff)
parent53430333c345c3531f9443d43c6fba1da693abe4 (diff)
downloadlinux-cb6a0fd4e4e15a65bb14b142089990df2def038e.tar.gz
linux-cb6a0fd4e4e15a65bb14b142089990df2def038e.tar.bz2
linux-cb6a0fd4e4e15a65bb14b142089990df2def038e.zip
Merge tag 'gpio-h-purge' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio into next/cleanup
This is a purge of all things <mach/gpio.h>, now I never want to see it again. - Remove the need for <mach/gpio.h> from S5P - Kill CONFIG_NEED_MACH_GPIO_H - Kill remnants of ARM_GPIOLIB_COMPLEX * tag 'gpio-h-purge' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: ARM: delete old reference to ARM_GPIOLIB_COMPLEX ARM: kill CONFIG_NEED_MACH_GPIO_H ARM: mach-s5p: get rid of all <mach/gpio.h> headers ARM: s5p: cut the custom ARCH_NR_GPIOS definition Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/samsung/goni_wm8994.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c
index 9506d7617223..3b527dcfc0aa 100644
--- a/sound/soc/samsung/goni_wm8994.c
+++ b/sound/soc/samsung/goni_wm8994.c
@@ -16,7 +16,7 @@
#include <sound/jack.h>
#include <asm/mach-types.h>
-#include <mach/gpio.h>
+#include <mach/gpio-samsung.h>
#include "../codecs/wm8994.h"