diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 16:47:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 16:47:54 -0400 |
| commit | 87affd0b9416d8f43d2d4de1f3fdfbe7f3559380 (patch) | |
| tree | 0da5dbe780fbd0e9f0050e3773d58da8cf1ecce1 /arch/x86/Kconfig.debug | |
| parent | c3b86a29429dac1033e3f602f51fa8d00006a8eb (diff) | |
| parent | 940b3c7b193ec54141976a8642c00582f423690c (diff) | |
Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: sfi: Make local functions static
x86, earlyprintk: Add hsu early console for Intel Medfield platform
x86, earlyprintk: Add earlyprintk for Intel Moorestown platform
x86: Add two helper macros for fixed address mapping
x86, mrst: A function in a header file needs to be marked "inline"
Diffstat (limited to 'arch/x86/Kconfig.debug')
| -rw-r--r-- | arch/x86/Kconfig.debug | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index 75085080b63e..e5bb96b10f1a 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
| @@ -43,6 +43,10 @@ config EARLY_PRINTK | |||
| 43 | with klogd/syslogd or the X server. You should normally N here, | 43 | with klogd/syslogd or the X server. You should normally N here, |
| 44 | unless you want to debug such a crash. | 44 | unless you want to debug such a crash. |
| 45 | 45 | ||
| 46 | config EARLY_PRINTK_MRST | ||
| 47 | bool "Early printk for MRST platform support" | ||
| 48 | depends on EARLY_PRINTK && X86_MRST | ||
| 49 | |||
| 46 | config EARLY_PRINTK_DBGP | 50 | config EARLY_PRINTK_DBGP |
| 47 | bool "Early printk via EHCI debug port" | 51 | bool "Early printk via EHCI debug port" |
| 48 | depends on EARLY_PRINTK && PCI | 52 | depends on EARLY_PRINTK && PCI |