From 930d4cbe41095be7edb65098d85e4b474a29118e Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Wed, 8 Dec 2010 11:07:58 +0530 Subject: [PATCH] --- yaml --- r: 227823 b: refs/heads/master c: 5dc55e0a39434ec8bec7978aef2dc00c91a530ba h: refs/heads/master i: 227821: 5f37d13a03cde71880a51e8131df052700629eeb 227819: 795c79fab1d81c1bbbadb4434f04041830d2cb93 227815: f74e3c3270ea23cd82364dcb4434837601a2192e 227807: ecab4693e214ecf8c908739fc353f311cc587a72 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/Makefile | 2 +- trunk/arch/arm/mach-ux500/include/mach/irqs.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1bab9f877f7a..73fa90189f9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92389ca8362c42952c7ebb8a0350ac522dcde0f4 +refs/heads/master: 5dc55e0a39434ec8bec7978aef2dc00c91a530ba diff --git a/trunk/arch/arm/mach-ux500/Makefile b/trunk/arch/arm/mach-ux500/Makefile index 12052e8e064c..fc2180d7308b 100644 --- a/trunk/arch/arm/mach-ux500/Makefile +++ b/trunk/arch/arm/mach-ux500/Makefile @@ -5,7 +5,7 @@ obj-y := clock.o cpu.o devices.o devices-common.o obj-$(CONFIG_UX500_SOC_DB5500) += cpu-db5500.o dma-db5500.o obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o prcmu.o -obj-$(CONFIG_MACH_U8500_MOP) += board-mop500.o board-mop500-sdi.o \ +obj-$(CONFIG_MACH_U8500) += board-mop500.o board-mop500-sdi.o \ board-mop500-keypads.o obj-$(CONFIG_MACH_U5500) += board-u5500.o board-u5500-sdi.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o diff --git a/trunk/arch/arm/mach-ux500/include/mach/irqs.h b/trunk/arch/arm/mach-ux500/include/mach/irqs.h index 880ae45bc235..ba1294c13c4d 100644 --- a/trunk/arch/arm/mach-ux500/include/mach/irqs.h +++ b/trunk/arch/arm/mach-ux500/include/mach/irqs.h @@ -36,7 +36,7 @@ /* This will be overridden by board-specific irq headers */ #define IRQ_BOARD_END IRQ_BOARD_START -#ifdef CONFIG_MACH_U8500_MOP +#ifdef CONFIG_MACH_U8500 #include #endif