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-mem-s3c24xx.h
diff --git
a/arch/arm/mach-s3c24xx/regs-mem.h
b/arch/arm/mach-s3c/regs-mem-s3c24xx.h
similarity index 98%
rename from
arch/arm/mach-s3c24xx/regs-mem.h
rename to
arch/arm/mach-s3c/regs-mem-s3c24xx.h
index 2f3bc48b589019e9609f5029d5bf13f7e35f6eea..8fed34a1672a20d8dbb11c031c366878ed344a42 100644
(file)
--- a/
arch/arm/mach-s3c24xx/regs-mem.h
+++ b/
arch/arm/mach-s3c/regs-mem-s3c24xx.h
@@
-9,6
+9,8
@@
#ifndef __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H
#define __ARCH_ARM_MACH_S3C24XX_REGS_MEM_H __FILE__
+#include "map-s3c.h"
+
#define S3C2410_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))
#define S3C2410_BWSCON S3C2410_MEMREG(0x00)