aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-02 19:23:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-02 19:23:38 -0400
commit159d8133d0b54a501a41a66fe3a0e7d16405e36d (patch)
treedd9b0204d90b25e1e0be933348776f09434333c6 /arch/cris
parent05bf58ca4b8f0be7d7af830f943f6d6b2c9ccee1 (diff)
parentc800bcd5f53fd9455fc6c68f1a34306e5aa4f79a (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "Usual rocket science -- mostly documentation and comment updates" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: sparse: fix comment doc: fix double words isdn: capi: fix "CAPI_VERSION" comment doc: DocBook: Fix typos in xml and template file Bluetooth: add module name for btwilink driver core: unexport static function create_syslog_header mmc: core: typo fix in printk specifier ARM: spear: clean up editing mistake net-sysfs: fix comment typo 'CONFIG_SYFS' doc: Insert MODULE_ in module-signing macros Documentation: update URL to hfsplus Technote 1150 gpio: update path to documentation ixgbe: Fix format string in ixgbe_fcoe. Kconfig: Remove useless "default N" lines user_namespace.c: Remove duplicated word in comment CREDITS: fix formatting treewide: Fix typo in Documentation/DocBook mm: Fix warning on make htmldocs caused by slab.c ata: ata-samsung_cf: cleanup in header file idr: remove unused prototype of idr_free()
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v32/drivers/Kconfig2
1 files changed, 0 insertions, 2 deletions
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