git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-ppc
/
mv64x60_defs.h
diff --git
a/include/asm-ppc/mv64x60_defs.h
b/include/asm-ppc/mv64x60_defs.h
index
2f42874
..
f8f7f16
100644
(file)
--- a/
include/asm-ppc/mv64x60_defs.h
+++ b/
include/asm-ppc/mv64x60_defs.h
@@
-333,7
+333,7
@@
/*
*****************************************************************************
*
/*
*****************************************************************************
*
- * SRAM Co
tn
roller Registers
+ * SRAM Co
nt
roller Registers
*
*****************************************************************************
*/
*
*****************************************************************************
*/
@@
-352,7
+352,7
@@
/*
*****************************************************************************
*
/*
*****************************************************************************
*
- * SDRAM/MEM Co
tn
roller Registers
+ * SDRAM/MEM Co
nt
roller Registers
*
*****************************************************************************
*/
*
*****************************************************************************
*/
@@
-375,6
+375,7
@@
/* SDRAM Control Registers */
#define MV64360_D_UNIT_CONTROL_LOW 0x1404
#define MV64360_D_UNIT_CONTROL_HIGH 0x1424
/* SDRAM Control Registers */
#define MV64360_D_UNIT_CONTROL_LOW 0x1404
#define MV64360_D_UNIT_CONTROL_HIGH 0x1424
+#define MV64460_D_UNIT_MMASK 0x14b0
/* SDRAM Error Report Registers (64360) */
#define MV64360_SDRAM_ERR_DATA_LO 0x1444
/* SDRAM Error Report Registers (64360) */
#define MV64360_SDRAM_ERR_DATA_LO 0x1444
@@
-388,7
+389,7
@@
/*
*****************************************************************************
*
/*
*****************************************************************************
*
- * Device/BOOT Co
tn
roller Registers
+ * Device/BOOT Co
nt
roller Registers
*
*****************************************************************************
*/
*
*****************************************************************************
*/
@@
-680,6
+681,8
@@
#define MV64x60_PCI1_SLAVE_P2P_IO_REMAP 0x0dec
#define MV64x60_PCI1_SLAVE_CPU_REMAP 0x0df0
#define MV64x60_PCI1_SLAVE_P2P_IO_REMAP 0x0dec
#define MV64x60_PCI1_SLAVE_CPU_REMAP 0x0df0
+#define MV64360_PCICFG_CPCI_HOTSWAP 0x68
+
/*
*****************************************************************************
*
/*
*****************************************************************************
*