summaryrefslogtreecommitdiffstats
path: root/drivers/serial/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-13 08:17:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-13 08:17:52 -0700
commitcec5455e457928153f5a51668dad3d68176feab5 (patch)
treebf62da1e26096c4cf97e56f8678269112dc306a1 /drivers/serial/Kconfig
parentb0cbc861a3c05e634520b049b5cc27ad6febb51f (diff)
parentc6375b0a8007fffe65109aeea032a9243df070e1 (diff)
downloadlinux-cec5455e457928153f5a51668dad3d68176feab5.tar.bz2
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (60 commits) microblaze_v8: Add MAINTAINERS fragment microblaze_v8: Uartlite for Microblaze microblaze_v8: Makefiles for Microblaze cpu microblaze_v8: Kconfig patches microblaze_v8: Interrupt handling and timer support microblaze_v8: syscalls.h microblaze_v8: pci headers microblaze_v8: Kbuild file microblaze_v8: string.h thread_info.h microblaze_v8: unistd.h microblaze_v8: fcntl.h sockios.h ucontext.h microblaze_v8: pool.h socket.h microblaze_v8: device.h param.h topology.h microblaze_v8: headers files entry.h current.h mman.h registers.h sembuf.h microblaze_v8: namei.h microblaze_v8: gpio.h, serial.h microblaze_v8: headers simple files - empty or redirect to asm-generic microblaze_v8: sigcontext.h siginfo.h microblaze_v8: termbits.h termios.h microblaze_v8: stats headers ...
Diffstat (limited to 'drivers/serial/Kconfig')
-rw-r--r--drivers/serial/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 0328fd4006e5..343e3a35b6a3 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -854,7 +854,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.
@@ -1340,7 +1340,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