projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull misc-for-upstream into release branch
[cascardo/linux.git]
/
include
/
asm-m32r
/
m32104ut
/
m32104ut_pld.h
diff --git
a/include/asm-m32r/m32104ut/m32104ut_pld.h
b/include/asm-m32r/m32104ut/m32104ut_pld.h
index
a4eac20
..
2dc89d6
100644
(file)
--- a/
include/asm-m32r/m32104ut/m32104ut_pld.h
+++ b/
include/asm-m32r/m32104ut/m32104ut_pld.h
@@
-1,5
+1,8
@@
+#ifndef _M32104UT_M32104UT_PLD_H
+#define _M32104UT_M32104UT_PLD_H
+
/*
/*
- * include/asm/m32104ut/m32104ut_pld.h
+ * include/asm
-m32r
/m32104ut/m32104ut_pld.h
*
* Definitions for Programable Logic Device(PLD) on M32104UT board.
* Based on m32700ut_pld.h
*
* Definitions for Programable Logic Device(PLD) on M32104UT board.
* Based on m32700ut_pld.h
@@
-12,11
+15,6
@@
* this archive for more details.
*/
* this archive for more details.
*/
-#ifndef _M32104UT_M32104UT_PLD_H
-#define _M32104UT_M32104UT_PLD_H
-
-#include <linux/config.h>
-
#if defined(CONFIG_PLAT_M32104UT)
#define PLD_PLAT_BASE 0x02c00000
#else
#if defined(CONFIG_PLAT_M32104UT)
#define PLD_PLAT_BASE 0x02c00000
#else
@@
-36,7
+34,7
@@
#define __reg8
#define __reg16
#define __reg32
#define __reg8
#define __reg16
#define __reg32
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLY__ */
/* CFC */
#define PLD_CFRSTCR __reg16(PLD_BASE + 0x0000)
/* CFC */
#define PLD_CFRSTCR __reg16(PLD_BASE + 0x0000)
@@
-160,4
+158,4
@@
#define PLD_SCTXB __reg16(PLD_BASE + 0x3800c)
#define PLD_SCRXB __reg16(PLD_BASE + 0x3800e)
#define PLD_SCTXB __reg16(PLD_BASE + 0x3800c)
#define PLD_SCRXB __reg16(PLD_BASE + 0x3800e)
-#endif /* _M32104UT_M32104UT_PLD_H */
+#endif /* _M32104UT_M32104UT_PLD_H */