Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6-omap-h63xx.git] / arch / sh / kernel / cpu / sh3 / Makefile

diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index 09faa056cd43b0eec5cc45673b9d1904142097e2..646eb6933614a0852ec21798e5d01265dbaac5ad 100644 (file)
--- a/arch/sh/kernel/cpu/sh3/Makefile
+++ b/arch/sh/kernel/cpu/sh3/Makefile
@@ -6,20 +6,20 @@ obj-y := ex.o probe.o entry.o
 
 # CPU subtype setup
 obj-$(CONFIG_CPU_SUBTYPE_SH7705)       += setup-sh7705.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7706)       += setup-sh7709.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7707)       += setup-sh7709.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7708)       += setup-sh7708.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7709)       += setup-sh7709.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7300)       += setup-sh7300.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7706)       += setup-sh770x.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7707)       += setup-sh770x.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7708)       += setup-sh770x.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7709)       += setup-sh770x.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7710)       += setup-sh7710.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7712)       += setup-sh7710.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7720)       += setup-sh7720.o
 
 # Primary on-chip clocks (common)
 clock-$(CONFIG_CPU_SH3)                        := clock-sh3.o
-clock-$(CONFIG_CPU_SUBTYPE_SH7300)     := clock-sh7300.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7705)     := clock-sh7705.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7706)     := clock-sh7706.o
 clock-$(CONFIG_CPU_SUBTYPE_SH7709)     := clock-sh7709.o
-clock-$(CONFIG_CPU_SUBTYPE_SH7710)     := clock-sh7300.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7710)     := clock-sh7710.o
+clock-$(CONFIG_CPU_SUBTYPE_SH7720)     := clock-sh7710.o
 
 obj-y  += $(clock-y)