diff --git a/[refs] b/[refs] index 9b50d4a46fc5..09ef101aca17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f8ffb5f6649a261372547a5841285c23409ab68 +refs/heads/master: 4286c2b08c1a24fcb96503a3fb43e69cb1ae0410 diff --git a/trunk/drivers/serial/Kconfig b/trunk/drivers/serial/Kconfig index 7d7f576da202..131901bfd5db 100644 --- a/trunk/drivers/serial/Kconfig +++ b/trunk/drivers/serial/Kconfig @@ -833,7 +833,7 @@ config SERIAL_IMX_CONSOLE config SERIAL_UARTLITE tristate "Xilinx uartlite serial port support" - depends on PPC32 + depends on PPC32 || MICROBLAZE select SERIAL_CORE help Say Y here if you want to use the Xilinx uartlite serial controller. @@ -1319,7 +1319,7 @@ config SERIAL_NETX_CONSOLE config SERIAL_OF_PLATFORM tristate "Serial port on Open Firmware platform bus" - depends on PPC_OF + depends on PPC_OF || MICROBLAZE depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL help If you have a PowerPC based system that has serial ports