diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-30 13:43:19 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-30 13:43:19 +1000 |
| commit | 719dbb2df78fc9a40e28392b07cd715bfc5a665c (patch) | |
| tree | 0bbc3b84b74178d18164f5522ee3715623f94bbe /arch/powerpc/Kconfig.debug | |
| parent | fbef66f0adcddf4475e19f3d09df22fb34e633f6 (diff) | |
| parent | 9f595fd8b54809fed13fc30906ef1e90a3fcfbc9 (diff) | |
| download | blackbird-op-linux-719dbb2df78fc9a40e28392b07cd715bfc5a665c.tar.gz blackbird-op-linux-719dbb2df78fc9a40e28392b07cd715bfc5a665c.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include more 8xx optimizations, device tree updates,
and MVME7100 support."
Diffstat (limited to 'arch/powerpc/Kconfig.debug')
| -rw-r--r-- | arch/powerpc/Kconfig.debug | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index cfe08eab90c6..171047822b56 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug @@ -212,7 +212,6 @@ config PPC_EARLY_DEBUG_40x config PPC_EARLY_DEBUG_CPM bool "Early serial debugging for Freescale CPM-based serial ports" depends on SERIAL_CPM - select PIN_TLB if PPC_8xx help Select this to enable early debugging for Freescale chips using a CPM-based serial port. This assumes that the bootwrapper |
