diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-27 16:58:53 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-04-27 16:58:53 -0700 |
| commit | 7bef0df7e8db98ef5139ab6295a36940a2f806c8 (patch) | |
| tree | 99699cb9c01878c9ee365be0d8bce51d20469341 /i2c | |
| parent | a615fe02db67e84a9b206f47a5e888f1d2638637 (diff) | |
| download | patches-7bef0df7e8db98ef5139ab6295a36940a2f806c8.tar.gz | |
patches added
Diffstat (limited to 'i2c')
| -rw-r--r-- | i2c/drivers-w1-w1.c-fix-a-compile-error.patch | 33 | ||||
| -rw-r--r-- | i2c/w1-clean-up-w1_con-dependency.patch | 32 |
2 files changed, 65 insertions, 0 deletions
diff --git a/i2c/drivers-w1-w1.c-fix-a-compile-error.patch b/i2c/drivers-w1-w1.c-fix-a-compile-error.patch new file mode 100644 index 0000000000000..b902938fe57d2 --- /dev/null +++ b/i2c/drivers-w1-w1.c-fix-a-compile-error.patch @@ -0,0 +1,33 @@ +From akpm@osdl.org Thu Apr 27 02:31:41 2006 +Message-Id: <200604270930.k3R9UkoG025245@shell0.pdx.osdl.net> +Subject: [patch 1/9] drivers/w1/w1.c: fix a compile error +To: greg@kroah.com +Cc: akpm@osdl.org, bunk@stusta.de, johnpol@2ka.mipt.ru +From: akpm@osdl.org +Date: Thu, 27 Apr 2006 02:29:18 -0700 + + +From: Adrian Bunk <bunk@stusta.de> + +drivers/w1/w1.c:197: error: static declaration of 'w1_bus_type' follows non-static declaration +drivers/w1/w1.h:217: error: previous declaration of 'w1_bus_type' was here + +Signed-off-by: Adrian Bunk <bunk@stusta.de> +Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru> +Signed-off-by: Andrew Morton <akpm@osdl.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/w1/w1.h | 1 - + 1 file changed, 1 deletion(-) + +--- gregkh-2.6.orig/drivers/w1/w1.h ++++ gregkh-2.6/drivers/w1/w1.h +@@ -211,7 +211,6 @@ static inline struct w1_master* dev_to_w + } + + extern struct device_driver w1_master_driver; +-extern struct bus_type w1_bus_type; + extern struct device w1_master_device; + extern int w1_max_slave_count; + extern int w1_max_slave_ttl; diff --git a/i2c/w1-clean-up-w1_con-dependency.patch b/i2c/w1-clean-up-w1_con-dependency.patch new file mode 100644 index 0000000000000..5b05226faf0e9 --- /dev/null +++ b/i2c/w1-clean-up-w1_con-dependency.patch @@ -0,0 +1,32 @@ +From johnpol@2ka.mipt.ru Thu Apr 27 08:40:59 2006 +Date: Thu, 27 Apr 2006 19:40:27 +0400 +From: Evgeniy Polyakov <johnpol@2ka.mipt.ru> +To: GregKH <greg@kroah.com> +Subject: w1: clean up W1_CON dependency. +Message-ID: <20060427154026.GB31564@2ka.mipt.ru> +Content-Disposition: inline + +If w1 is not enabled, w1_con should not appear in configuration, +even if no logic is turned on without w1. +W1_CON should depend on W1 also. + +Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> +Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + +--- + drivers/w1/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- gregkh-2.6.orig/drivers/w1/Kconfig ++++ gregkh-2.6/drivers/w1/Kconfig +@@ -12,7 +12,7 @@ config W1 + will be called wire.ko. + + config W1_CON +- depends on CONNECTOR ++ depends on CONNECTOR && W1 + bool "Userspace communication over connector" + default y + --- help --- |