Commit 120e4768 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus' of git://github.com/openrisc/linux

Pull OpenRISC update from Stafford Horne:
 "White space fixups in Kconfig files from Krzysztof Kozlowski"

* tag 'for-linus' of git://github.com/openrisc/linux:
  openrisc: Fix Kconfig indentation
parents fcaa0ad7 0ecdcaa6
...@@ -13,7 +13,7 @@ config OPENRISC ...@@ -13,7 +13,7 @@ config OPENRISC
select IRQ_DOMAIN select IRQ_DOMAIN
select HANDLE_DOMAIN_IRQ select HANDLE_DOMAIN_IRQ
select GPIOLIB select GPIOLIB
select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRACEHOOK
select SPARSE_IRQ select SPARSE_IRQ
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select GENERIC_IRQ_PROBE select GENERIC_IRQ_PROBE
...@@ -51,12 +51,12 @@ config NO_IOPORT_MAP ...@@ -51,12 +51,12 @@ config NO_IOPORT_MAP
def_bool y def_bool y
config TRACE_IRQFLAGS_SUPPORT config TRACE_IRQFLAGS_SUPPORT
def_bool y def_bool y
# For now, use generic checksum functions # For now, use generic checksum functions
#These can be reimplemented in assembly later if so inclined #These can be reimplemented in assembly later if so inclined
config GENERIC_CSUM config GENERIC_CSUM
def_bool y def_bool y
config STACKTRACE_SUPPORT config STACKTRACE_SUPPORT
def_bool y def_bool y
...@@ -89,8 +89,8 @@ config DCACHE_WRITETHROUGH ...@@ -89,8 +89,8 @@ config DCACHE_WRITETHROUGH
If unsure say N here If unsure say N here
config OPENRISC_BUILTIN_DTB config OPENRISC_BUILTIN_DTB
string "Builtin DTB" string "Builtin DTB"
default "" default ""
menu "Class II Instructions" menu "Class II Instructions"
...@@ -161,13 +161,13 @@ config OPENRISC_HAVE_SHADOW_GPRS ...@@ -161,13 +161,13 @@ config OPENRISC_HAVE_SHADOW_GPRS
On a unicore system it's safe to say N here if you are unsure. On a unicore system it's safe to say N here if you are unsure.
config CMDLINE config CMDLINE
string "Default kernel command string" string "Default kernel command string"
default "" default ""
help help
On some architectures there is currently no way for the boot loader On some architectures there is currently no way for the boot loader
to pass arguments to the kernel. For these architectures, you should to pass arguments to the kernel. For these architectures, you should
supply some command-line options at build time by entering them supply some command-line options at build time by entering them
here. here.
menu "Debugging options" menu "Debugging options"
...@@ -185,7 +185,7 @@ config OPENRISC_ESR_EXCEPTION_BUG_CHECK ...@@ -185,7 +185,7 @@ config OPENRISC_ESR_EXCEPTION_BUG_CHECK
default n default n
help help
This option enables some checks that might expose some problems This option enables some checks that might expose some problems
in kernel. in kernel.
Say N if you are unsure. Say N if you are unsure.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment