summaryrefslogtreecommitdiff
path: root/arch/arm/plat-s5pc1xx/gpiolib.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-22 14:17:26 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-22 14:17:26 +0300
commitf9b44121b34174ae4f243a568393fc3225842e75 (patch)
tree943f68cd7458d08a9e8809ed0a10b71b23911f3e /arch/arm/plat-s5pc1xx/gpiolib.c
parent8727b909bb2348d29e62c599cd7a5d610da3760f (diff)
parent220bf991b0366cc50a94feede3d7341fa5710ee4 (diff)
downloadlinux-f9b44121b34174ae4f243a568393fc3225842e75.tar.xz
Merge commit 'v2.6.34-rc2' into for-2.6.34
Diffstat (limited to 'arch/arm/plat-s5pc1xx/gpiolib.c')
-rw-r--r--arch/arm/plat-s5pc1xx/gpiolib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s5pc1xx/gpiolib.c b/arch/arm/plat-s5pc1xx/gpiolib.c
index facb410e7a71..1ffc57ac293d 100644
--- a/arch/arm/plat-s5pc1xx/gpiolib.c
+++ b/arch/arm/plat-s5pc1xx/gpiolib.c
@@ -17,8 +17,8 @@
#include <linux/gpio.h>
#include <mach/map.h>
-#include <mach/gpio-core.h>
+#include <plat/gpio-core.h>
#include <plat/gpio-cfg.h>
#include <plat/gpio-cfg-helpers.h>
#include <plat/regs-gpio.h>