From johnpol@2ka.mipt.ru Mon Jul 25 06:35:06 2005
Date: Mon, 25 Jul 2005 14:29:48 +0400
From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
To: GregKH <greg@kroah.com>
Subject: w1: kconfig/Makefile fix.
Message-ID: <20050725102948.GB6378@2ka.mipt.ru>

This patch was sent first time very long time ago, 
but magically was disapeared, it probably exists
in your queue, but to be sure, I resend it.
If can not be applied cleanly after your w1 queue is flushed
into upstrem tree, just drop it.
Thanks.

Patch from Michael Farmbauer <michl@baldrian.franken.de>.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/w1/Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- gregkh-2.6.orig/drivers/w1/Kconfig	2005-07-13 09:45:06.000000000 -0700
+++ gregkh-2.6/drivers/w1/Kconfig	2005-07-26 15:05:32.000000000 -0700
@@ -30,7 +30,7 @@
 	  This support is also available as a module.  If so, the module
 	  will be called ds9490r.ko.
 
-config W1_DS9490R_BRIDGE
+config W1_DS9490_BRIDGE
 	tristate "DS9490R USB <-> W1 transport layer for 1-wire"
 	depends on W1_DS9490
 	help