[PATCH] ARM: OMAP: Replace last occurrences of ARCH_OMAP1510 with ARCH_OMAP15XX

The attached patch fixes a problem noticed when compiling the kernel
for the OSK 5912 board using default config:
make omap_osk_5912_defconfig
make uImage

diff --git a/arch/arm/configs/omap_generic_1510_defconfig b/arch/arm/configs/omap_generic_1510_defconfig
index 5d0fd228edb099eef43aae37b50beb643d0e6843..5091946f1a3574e5b5eeac31dd696ba383803c77 100644 (file)
--- a/arch/arm/configs/omap_generic_1510_defconfig
+++ b/arch/arm/configs/omap_generic_1510_defconfig
@@ -96,7 +96,7 @@ CONFIG_ARCH_OMAP=y
 #
 # TI OMAP Implementations
 #
-CONFIG_ARCH_OMAP1510=y
+CONFIG_ARCH_OMAP15XX=y
 # CONFIG_ARCH_OMAP1610 is not set
 # CONFIG_OMAP_INNOVATOR is not set
 CONFIG_MACH_OMAP_GENERIC=y

diff --git a/arch/arm/configs/omap_generic_1610_defconfig b/arch/arm/configs/omap_generic_1610_defconfig
index 97400c201099cce4e2214e566b6af7d52632d63e..b772e7ed44182233f786991ef94b0b45e0f733c4 100644 (file)
--- a/arch/arm/configs/omap_generic_1610_defconfig
+++ b/arch/arm/configs/omap_generic_1610_defconfig
@@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y
 # OMAP Core Type
 #
 # CONFIG_ARCH_OMAP730 is not set
-# CONFIG_ARCH_OMAP1510 is not set
+# CONFIG_ARCH_OMAP15XX is not set
 CONFIG_ARCH_OMAP16XX=y
 CONFIG_ARCH_OMAP_OTG=y
 

diff --git a/arch/arm/configs/omap_generic_1710_defconfig b/arch/arm/configs/omap_generic_1710_defconfig
index 834eb06ce92bce19a1048f847e699a9e10446db5..579cff1b056ff1587de3ee8a460ff2af06bbc34f 100644 (file)
--- a/arch/arm/configs/omap_generic_1710_defconfig
+++ b/arch/arm/configs/omap_generic_1710_defconfig
@@ -80,7 +80,7 @@ CONFIG_ARCH_OMAP=y
 # OMAP Core Type
 #
 # CONFIG_ARCH_OMAP730 is not set
-# CONFIG_ARCH_OMAP1510 is not set
+# CONFIG_ARCH_OMAP15XX is not set
 CONFIG_ARCH_OMAP16XX=y
 CONFIG_ARCH_OMAP_OTG=y
 

diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig
index d7406db43893aaecb75437afb5433cee091b4347..8cb032e02a2711524fc07da0cb0c8822a24571dc 100644 (file)
--- a/arch/arm/configs/omap_h2_1610_defconfig
+++ b/arch/arm/configs/omap_h2_1610_defconfig
@@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y
 # OMAP Core Type
 #
 # CONFIG_ARCH_OMAP730 is not set
-# CONFIG_ARCH_OMAP1510 is not set
+# CONFIG_ARCH_OMAP15XX is not set
 CONFIG_ARCH_OMAP16XX=y
 CONFIG_ARCH_OMAP_OTG=y
 

diff --git a/arch/arm/configs/omap_h3_1710_defconfig b/arch/arm/configs/omap_h3_1710_defconfig
index f63dad46912766f57d565b2f3d218122395bfe12..b55601787430eae49228d049514c0c434149e57f 100644 (file)
--- a/arch/arm/configs/omap_h3_1710_defconfig
+++ b/arch/arm/configs/omap_h3_1710_defconfig
@@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y
 # OMAP Core Type
 #
 # CONFIG_ARCH_OMAP730 is not set
-# CONFIG_ARCH_OMAP1510 is not set
+# CONFIG_ARCH_OMAP15XX is not set
 CONFIG_ARCH_OMAP16XX=y
 CONFIG_ARCH_OMAP_OTG=y
 

diff --git a/arch/arm/configs/omap_innovator_1510_defconfig b/arch/arm/configs/omap_innovator_1510_defconfig
index ed3a7f6bb2877a49d804bba375a5b4c9c3281482..fc5850b3215f87defc6c9ba8bfdcd81c879bf418 100644 (file)
--- a/arch/arm/configs/omap_innovator_1510_defconfig
+++ b/arch/arm/configs/omap_innovator_1510_defconfig
@@ -80,7 +80,7 @@ CONFIG_ARCH_OMAP=y
 # OMAP Core Type
 #
 # CONFIG_ARCH_OMAP730 is not set
-CONFIG_ARCH_OMAP1510=y
+CONFIG_ARCH_OMAP15XX=y
 # CONFIG_ARCH_OMAP1610 is not set
 # CONFIG_ARCH_OMAP1710 is not set
 # CONFIG_ARCH_OMAP5912 is not set

diff --git a/arch/arm/configs/omap_innovator_1610_defconfig b/arch/arm/configs/omap_innovator_1610_defconfig
index cd4ab86ca4637f166dd55f178b3aee08ea72af9b..460c7a18d5a48f991f09d6053118a01868bbcf80 100644 (file)
--- a/arch/arm/configs/omap_innovator_1610_defconfig
+++ b/arch/arm/configs/omap_innovator_1610_defconfig
@@ -84,7 +84,7 @@ CONFIG_ARCH_OMAP=y
 # OMAP Core Type
 #
 # CONFIG_ARCH_OMAP730 is not set
-# CONFIG_ARCH_OMAP1510 is not set
+# CONFIG_ARCH_OMAP15XX is not set
 CONFIG_ARCH_OMAP16XX=y
 CONFIG_ARCH_OMAP_OTG=y
 

diff --git a/arch/arm/configs/omap_osk_5912_defconfig b/arch/arm/configs/omap_osk_5912_defconfig
index 82cd3f8aed2a47ff792eee270afb7a23d523f280..dae95ee1c50a241bf1ea4757e2108fac97002600 100644 (file)
--- a/arch/arm/configs/omap_osk_5912_defconfig
+++ b/arch/arm/configs/omap_osk_5912_defconfig
@@ -95,7 +95,7 @@ CONFIG_ARCH_OMAP1=y
 # OMAP Core Type
 #
 # CONFIG_ARCH_OMAP730 is not set
-# CONFIG_ARCH_OMAP1510 is not set
+# CONFIG_ARCH_OMAP15XX is not set
 CONFIG_ARCH_OMAP16XX=y
 
 #

diff --git a/arch/arm/configs/omap_perseus2_730_defconfig b/arch/arm/configs/omap_perseus2_730_defconfig
index 075d23b6b03fb9cb118e1acb10b8a7d1e50bba54..f61fae6218b57c913318bbf90a12097e1657594a 100644 (file)
--- a/arch/arm/configs/omap_perseus2_730_defconfig
+++ b/arch/arm/configs/omap_perseus2_730_defconfig
@@ -88,7 +88,7 @@ CONFIG_ARCH_OMAP=y
 # OMAP Core Type
 #
 CONFIG_ARCH_OMAP730=y
-# CONFIG_ARCH_OMAP1510 is not set
+# CONFIG_ARCH_OMAP15XX is not set
 # CONFIG_ARCH_OMAP16XX is not set
 CONFIG_ARCH_OMAP_OTG=y
 

diff --git a/arch/arm/configs/palmte_defconfig b/arch/arm/configs/palmte_defconfig
index 781886dee4a6fa6a6c9f6765270076ccb575d405..26a8999e366cb73870292e73860c38caf097158d 100644 (file)
--- a/arch/arm/configs/palmte_defconfig
+++ b/arch/arm/configs/palmte_defconfig
@@ -103,7 +103,7 @@ CONFIG_OMAP_SERIAL_WAKE=y
 # OMAP Core Type
 #
 # CONFIG_ARCH_OMAP730 is not set
-CONFIG_ARCH_OMAP1510=y
+CONFIG_ARCH_OMAP15XX=y
 # CONFIG_ARCH_OMAP16XX is not set
 
 #

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index b7814bab6539c23319c78fc018848e5094286ba4..a8d2d9aec3073243ab8bb824161593c308ca4828 100644 (file)
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -77,7 +77,7 @@ config MACH_NETSTAR
 
 config MACH_OMAP_PALMTE
        bool "Palm Tungsten E"
-       depends on ARCH_OMAP1 && ARCH_OMAP1510
+       depends on ARCH_OMAP1 && ARCH_OMAP15XX
        help
           Support for the Palm Tungsten E PDA. Currently only the LCD panel
           is supported. To boot the kernel, you'll need a PalmOS compatible

diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index 5b969a194363e42f3c258f76140f1c99e55f25b4..cdbf4d7620c6ce49df6f813d8f398c96fd084862 100644 (file)
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -227,7 +227,7 @@ unsigned long long sched_clock(void)
 #ifdef CONFIG_OMAP_32K_TIMER
 
 #ifdef CONFIG_ARCH_OMAP15XX
-#error OMAP 32KHz timer does not currently work on 1510!
+#error OMAP 32KHz timer does not currently work on 15XX!
 #endif
 
 /*