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 branch 'master' of /home/davem/src/GIT/linux-2.6/
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c2410
/
include
/
mach
/
map.h
diff --git
a/arch/arm/mach-s3c2410/include/mach/map.h
b/arch/arm/mach-s3c2410/include/mach/map.h
index 091c98a639d9896f2234343c29fc713592026198..cd3983ad41604ee71234b2d14ce79e51563bad91 100644
(file)
--- a/
arch/arm/mach-s3c2410/include/mach/map.h
+++ b/
arch/arm/mach-s3c2410/include/mach/map.h
@@
-114,6
+114,7
@@
#define S3C_PA_USBHOST S3C2410_PA_USBHOST
#define S3C_PA_HSMMC0 S3C2443_PA_HSMMC
#define S3C_PA_HSMMC1 S3C2416_PA_HSMMC0
+#define S3C_PA_WDT S3C2410_PA_WATCHDOG
#define S3C_PA_NAND S3C24XX_PA_NAND
#endif /* __ASM_ARCH_MAP_H */