From abc20aba1834c321a638b367c18dcce1bb4e232d Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Sat, 26 Nov 2011 07:20:07 +0100
Subject: PXA: Rename CONFIG_PXA2[57]X to CONFIG_CPU_PXA2[57]X

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
 drivers/serial/serial_pxa.c | 4 ++--
 drivers/serial/usbtty.h     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'drivers/serial')

diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c
index 84bb17c1105..a9976d709a7 100644
--- a/drivers/serial/serial_pxa.c
+++ b/drivers/serial/serial_pxa.c
@@ -49,7 +49,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define	BTUART_INDEX	0
 #define	FFUART_INDEX	1
 #define	STUART_INDEX	2
-#elif	CONFIG_PXA250
+#elif	CONFIG_CPU_PXA25X
 #define	UART_CLK_BASE	(1 << 4)	/* HWUART */
 #define	UART_CLK_REG	CKEN
 #define	HWUART_INDEX	0
@@ -68,7 +68,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * Only PXA250 has HWUART, to avoid poluting the code with more macros,
  * artificially introduce this.
  */
-#ifndef	CONFIG_PXA250
+#ifndef	CONFIG_CPU_PXA25X
 #define	HWUART_INDEX	0xff
 #endif
 
diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h
index 14961c1969d..e449cd717df 100644
--- a/drivers/serial/usbtty.h
+++ b/drivers/serial/usbtty.h
@@ -31,7 +31,7 @@
 #include <usb/omap1510_udc.h>
 #elif defined(CONFIG_MUSB_UDC)
 #include <usb/musb_udc.h>
-#elif defined(CONFIG_PXA27X)
+#elif defined(CONFIG_CPU_PXA27X)
 #include <usb/pxa27x_udc.h>
 #elif defined(CONFIG_SPEAR3XX) || defined(CONFIG_SPEAR600)
 #include <usb/spr_udc.h>
-- 
cgit v1.2.3