diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 12:17:26 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 12:17:26 +0100 |
commit | f9b44121b34174ae4f243a568393fc3225842e75 (patch) | |
tree | 943f68cd7458d08a9e8809ed0a10b71b23911f3e /arch/arm/plat-s3c24xx/gpiolib.c | |
parent | ASoC: pxa-pcm-lib: initialize DMA channel to -1 (diff) | |
parent | Linux 2.6.34-rc2 (diff) | |
download | linux-f9b44121b34174ae4f243a568393fc3225842e75.tar.xz linux-f9b44121b34174ae4f243a568393fc3225842e75.zip |
Merge commit 'v2.6.34-rc2' into for-2.6.34
Diffstat (limited to 'arch/arm/plat-s3c24xx/gpiolib.c')
-rw-r--r-- | arch/arm/plat-s3c24xx/gpiolib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c index 6d7a961d3269..4f0f11a6a677 100644 --- a/arch/arm/plat-s3c24xx/gpiolib.c +++ b/arch/arm/plat-s3c24xx/gpiolib.c @@ -20,7 +20,7 @@ #include <linux/io.h> #include <linux/gpio.h> -#include <mach/gpio-core.h> +#include <plat/gpio-core.h> #include <mach/hardware.h> #include <asm/irq.h> #include <plat/pm.h> |