Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / boot / compressed / Makefile

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 5fde99f9d9f93dafbf2e555a646b3f08ebbbc561..2980faf53313ace2dca31fa5e56690f04bf757e9 100644 (file)
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -44,8 +44,8 @@ ifeq ($(CONFIG_PXA_SHARPSL),y)
 OBJS           += head-sharpsl.o
 endif
 
-ifeq ($(CONFIG_ARCH_AT91RM9200),y)
-OBJS           += head-at91rm9200.o
+ifeq ($(CONFIG_MACH_OMAP_PERSEUS2),y)
+OBJS           += head-omap.o
 endif
 
 ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)