diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 12:57:41 +0900 |
| commit | 9d14070f656addddce3d63fd483de46930b51850 (patch) | |
| tree | a8767c2547dd2b6f49974503a5169d8c08de00e9 /arch/sh/include/cpu-sh4/cpu/sh7724.h | |
| parent | 9f06cf38eca57e279b4c78e465e19f10c2f78174 (diff) | |
| parent | a319add1e24c43d285b781332cfa532405466650 (diff) | |
| download | linux-9d14070f656addddce3d63fd483de46930b51850.tar.bz2 | |
Merge branch 'sh/hwblk' into sh-latest
Diffstat (limited to 'arch/sh/include/cpu-sh4/cpu/sh7724.h')
| -rw-r--r-- | arch/sh/include/cpu-sh4/cpu/sh7724.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/include/cpu-sh4/cpu/sh7724.h b/arch/sh/include/cpu-sh4/cpu/sh7724.h index 36ce466cbf07..38859f96d4e5 100644 --- a/arch/sh/include/cpu-sh4/cpu/sh7724.h +++ b/arch/sh/include/cpu-sh4/cpu/sh7724.h @@ -268,10 +268,9 @@ enum { }; enum { - HWBLK_UNKNOWN = 0, HWBLK_TLB, HWBLK_IC, HWBLK_OC, HWBLK_RSMEM, HWBLK_ILMEM, HWBLK_L2C, HWBLK_FPU, HWBLK_INTC, HWBLK_DMAC0, HWBLK_SHYWAY, - HWBLK_HUDI, HWBLK_DBG, HWBLK_UBC, + HWBLK_HUDI, HWBLK_UBC, HWBLK_TMU0, HWBLK_CMT, HWBLK_RWDT, HWBLK_DMAC1, HWBLK_TMU1, HWBLK_SCIF0, HWBLK_SCIF1, HWBLK_SCIF2, HWBLK_SCIF3, HWBLK_SCIF4, HWBLK_SCIF5, HWBLK_MSIOF0, HWBLK_MSIOF1, |