git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c
/
regs-gpio-s3c24xx.h
diff --git
a/arch/arm/mach-s3c24xx/include/mach/regs-gpio.h
b/arch/arm/mach-s3c/regs-gpio-s3c24xx.h
similarity index 99%
rename from
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h
rename to
arch/arm/mach-s3c/regs-gpio-s3c24xx.h
index 594e967c0673851f5e23bd135f99d4440d6ad352..9a7e262268a7b78e35252cfea6b0b31bb4a66d2d 100644
(file)
--- a/
arch/arm/mach-s3c24xx/include/mach/regs-gpio.h
+++ b/
arch/arm/mach-s3c/regs-gpio-s3c24xx.h
@@
-10,6
+10,8
@@
#ifndef __ASM_ARCH_REGS_GPIO_H
#define __ASM_ARCH_REGS_GPIO_H
+#include "map-s3c.h"
+
#define S3C24XX_MISCCR S3C24XX_GPIOREG2(0x80)
/* general configuration options */