aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arc/Kconfig1
-rw-r--r--arch/arm/mach-spear/Kconfig2
-rw-r--r--arch/cris/arch-v32/drivers/Kconfig2
-rw-r--r--arch/s390/include/asm/cio.h2
4 files changed, 2 insertions, 5 deletions
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 9be30c8cb0c2..75de197a2fef 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -356,7 +356,6 @@ config ARC_CURR_IN_REG
356 356
357config ARC_MISALIGN_ACCESS 357config ARC_MISALIGN_ACCESS
358 bool "Emulate unaligned memory access (userspace only)" 358 bool "Emulate unaligned memory access (userspace only)"
359 default N
360 select SYSCTL_ARCH_UNALIGN_NO_WARN 359 select SYSCTL_ARCH_UNALIGN_NO_WARN
361 select SYSCTL_ARCH_UNALIGN_ALLOW 360 select SYSCTL_ARCH_UNALIGN_ALLOW
362 help 361 help
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index ac1710e64d9a..308d5b5b3055 100644
--- a/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@ -92,7 +92,7 @@ config MACH_SPEAR600
92 depends on ARCH_SPEAR6XX 92 depends on ARCH_SPEAR6XX
93 select USE_OF 93 select USE_OF
94 help 94 help
95 Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig" 95 Supports ST SPEAr600 boards configured via the device-tree
96 96
97config ARCH_SPEAR_AUTO 97config ARCH_SPEAR_AUTO
98 def_bool PLAT_SPEAR_SINGLE 98 def_bool PLAT_SPEAR_SINGLE
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 6792503aaf79..15a9ed1d579c 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -11,7 +11,6 @@ config ETRAX_ETHERNET
11config ETRAX_NO_PHY 11config ETRAX_NO_PHY
12 bool "PHY not present" 12 bool "PHY not present"
13 depends on ETRAX_ETHERNET 13 depends on ETRAX_ETHERNET
14 default N
15 help 14 help
16 This option disables all MDIO communication with an ethernet 15 This option disables all MDIO communication with an ethernet
17 transceiver connected to the MII interface. This option shall 16 transceiver connected to the MII interface. This option shall
@@ -116,7 +115,6 @@ config ETRAX_AXISFLASHMAP
116config ETRAX_AXISFLASHMAP_MTD0WHOLE 115config ETRAX_AXISFLASHMAP_MTD0WHOLE
117 bool "MTD0 is whole boot flash device" 116 bool "MTD0 is whole boot flash device"
118 depends on ETRAX_AXISFLASHMAP 117 depends on ETRAX_AXISFLASHMAP
119 default N
120 help 118 help
121 When this option is not set, mtd0 refers to the first partition 119 When this option is not set, mtd0 refers to the first partition
122 on the boot flash device. When set, mtd0 refers to the whole 120 on the boot flash device. When set, mtd0 refers to the whole
diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h
index d42625053c37..096339207764 100644
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
@@ -199,7 +199,7 @@ struct esw_eadm {
199/** 199/**
200 * struct irb - interruption response block 200 * struct irb - interruption response block
201 * @scsw: subchannel status word 201 * @scsw: subchannel status word
202 * @esw: extened status word 202 * @esw: extended status word
203 * @ecw: extended control word 203 * @ecw: extended control word
204 * 204 *
205 * The irb that is handed to the device driver when an interrupt occurs. For 205 * The irb that is handed to the device driver when an interrupt occurs. For