From a03abdcb8e537912c9c44f283747b995d1788d23 Mon Sep 17 00:00:00 2001 From: Dmitry Artamonow Date: Mon, 2 Apr 2012 09:42:22 +0400 Subject: w1: fix slave driver registration error message W1 core prints "Failed to register master driver" if error happens on registering SLAVE driver. Fix it. Signed-off-by: Dmitry Artamonow Acked-by: Evgeniy Polyakov Signed-off-by: Jiri Kosina --- drivers/w1/w1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/w1') diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 9761950697b4..2f2e894ea0c8 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -1027,7 +1027,7 @@ static int __init w1_init(void) retval = driver_register(&w1_slave_driver); if (retval) { printk(KERN_ERR - "Failed to register master driver. err=%d.\n", + "Failed to register slave driver. err=%d.\n", retval); goto err_out_master_unregister; } -- cgit v1.2.3 From d132d7f6fbb9cc246dab828fc9740e5caf78aeb3 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Mon, 7 May 2012 11:14:59 +0200 Subject: Kconfig: replace "--- help ---" with "---help---" There are three Kconfig entries with "--- help ---" attributes, and over 2000 Kconfig entries with "---help---" attributes. Apparently the three attributes with embedded spaces are valid. Still, I see little reason for using this obscure variant. And replacing those three attributes with the common variant makes grepping Kconfig files for help texts a bit easier too. Signed-off-by: Paul Bolle Signed-off-by: Jiri Kosina --- drivers/usb/host/Kconfig | 2 +- drivers/w1/Kconfig | 2 +- net/caif/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/w1') diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index f788eb86707c..e96c4b91644e 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -152,7 +152,7 @@ config USB_EHCI_HCD_OMAP bool "EHCI support for OMAP3 and later chips" depends on USB_EHCI_HCD && ARCH_OMAP default y - --- help --- + ---help--- Enables support for the on-chip EHCI controller on OMAP3 and later chips. diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig index fd2c7bd9dfbe..6743bde038cc 100644 --- a/drivers/w1/Kconfig +++ b/drivers/w1/Kconfig @@ -16,7 +16,7 @@ config W1_CON depends on CONNECTOR bool "Userspace communication over connector" default y - --- help --- + ---help--- This allows to communicate with userspace using connector. For more information see . There are three types of messages between w1 core and userspace: diff --git a/net/caif/Kconfig b/net/caif/Kconfig index 936361e5a2b6..d3694953b1d7 100644 --- a/net/caif/Kconfig +++ b/net/caif/Kconfig @@ -25,7 +25,7 @@ config CAIF_DEBUG bool "Enable Debug" depends on CAIF default n - --- help --- + ---help--- Enable the inclusion of debug code in the CAIF stack. Be aware that doing this will impact performance. If unsure say N. -- cgit v1.2.3