diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2011-11-26 07:20:07 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-12-06 23:59:32 +0100 |
| commit | abc20aba1834c321a638b367c18dcce1bb4e232d (patch) | |
| tree | cc59ef2d03cef765043d96b5dfbbfc5c41329370 /drivers/serial | |
| parent | 3e43c749f2c9c22e0841294c304639907b444608 (diff) | |
| download | talos-obmc-uboot-abc20aba1834c321a638b367c18dcce1bb4e232d.tar.gz talos-obmc-uboot-abc20aba1834c321a638b367c18dcce1bb4e232d.zip | |
PXA: Rename CONFIG_PXA2[57]X to CONFIG_CPU_PXA2[57]X
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_pxa.c | 4 | ||||
| -rw-r--r-- | drivers/serial/usbtty.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c index 84bb17c110..a9976d709a 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 14961c1969..e449cd717d 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> |
