]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ux500: rename MOP board Kconfig
authorRabin Vincent <rabin.vincent@stericsson.com>
Wed, 8 Dec 2010 05:37:58 +0000 (11:07 +0530)
committerLinus Walleij <linus.walleij@stericsson.com>
Mon, 10 Jan 2011 17:34:53 +0000 (18:34 +0100)
Rename the MOP board Kconfig entries to the same name as the machine
type, so that the machine_is_*() macros work correctly.

Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
[Updated to match changes in the tree]
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/include/mach/irqs.h

index 12052e8e064cc8ab9400825423ad3e6aecc13733..fc2180d7308b2751ef42995b0c7b8ba38c65d6e5 100644 (file)
@@ -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
index 880ae45bc2352b6d5452690f24a713f748b47fbe..ba1294c13c4dc56939ff7d02ce108980c12d41fd 100644 (file)
@@ -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 <mach/irqs-board-mop500.h>
 #endif