Merge HEAD from source.mvista.com:/home/git/linux-omap-2.6.git

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

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
 

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
 

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
 

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
 

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

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
 

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
 
 #

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
 

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
 
 #

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

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
 
 /*