diff --git a/[refs] b/[refs] index 55d3ce732755..c615db13c03c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7b1a68b25093753155ea752ff865c9dfcf33d79 +refs/heads/master: b885b27ce67013a7aa7f4181fdd916a29c623850 diff --git a/trunk/drivers/serial/Kconfig b/trunk/drivers/serial/Kconfig index 8a053ea21e1d..4fa7927997ad 100644 --- a/trunk/drivers/serial/Kconfig +++ b/trunk/drivers/serial/Kconfig @@ -1295,8 +1295,8 @@ config SERIAL_NETX_CONSOLE depends on SERIAL_NETX select SERIAL_CORE_CONSOLE help - If you have enabled the serial port on the Motorola IMX - CPU you can make it the console by answering Y to this option. + If you have enabled the serial port on the Hilscher NetX SoC + you can make it the console by answering Y to this option. config SERIAL_OF_PLATFORM tristate "Serial port on Open Firmware platform bus"