summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2400/gpio.c
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-10-23 13:24:10 (GMT)
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-10-23 13:24:10 (GMT)
commitd9214556b11a8d18ff588e60824c12041d30f791 (patch)
tree04ab59d13961675811a55c96fb12b2b167b72318 /arch/arm/mach-s3c2400/gpio.c
parent72a1419a9d4c859a3345e4b83f8ef7d599d3818c (diff)
parente82c6106b04b85879d802bbbeaed30d9b10a92e2 (diff)
downloadlinux-d9214556b11a8d18ff588e60824c12041d30f791.tar.xz
Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'arch/arm/mach-s3c2400/gpio.c')
-rw-r--r--arch/arm/mach-s3c2400/gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2400/gpio.c b/arch/arm/mach-s3c2400/gpio.c
index 148d0dd..7a7ed417 100644
--- a/arch/arm/mach-s3c2400/gpio.c
+++ b/arch/arm/mach-s3c2400/gpio.c
@@ -24,10 +24,10 @@
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
+#include <linux/io.h>
#include <mach/hardware.h>
#include <asm/irq.h>
-#include <asm/io.h>
#include <mach/regs-gpio.h>