summaryrefslogtreecommitdiff
path: root/arch/sh/include/cpu-sh4/cpu/sh7724.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-12 07:57:41 +0400
committerPaul Mundt <lethal@linux-sh.org>2012-01-12 07:57:41 +0400
commit9d14070f656addddce3d63fd483de46930b51850 (patch)
treea8767c2547dd2b6f49974503a5169d8c08de00e9 /arch/sh/include/cpu-sh4/cpu/sh7724.h
parent9f06cf38eca57e279b4c78e465e19f10c2f78174 (diff)
parenta319add1e24c43d285b781332cfa532405466650 (diff)
downloadlinux-9d14070f656addddce3d63fd483de46930b51850.tar.xz
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.h3
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,