projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
[powerpc.git]
/
drivers
/
w1
/
Kconfig
diff --git
a/drivers/w1/Kconfig
b/drivers/w1/Kconfig
index
ca75b3a
..
6854fd6
100644
(file)
--- a/
drivers/w1/Kconfig
+++ b/
drivers/w1/Kconfig
@@
-1,8
+1,6
@@
-menu "Dallas's 1-wire bus"
- depends on HAS_IOMEM
-
-config W1
+menuconfig W1
tristate "Dallas's 1-wire support"
tristate "Dallas's 1-wire support"
+ depends on HAS_IOMEM
---help---
Dallas' 1-wire bus is useful to connect slow 1-pin devices
such as iButtons and thermal sensors.
---help---
Dallas' 1-wire bus is useful to connect slow 1-pin devices
such as iButtons and thermal sensors.
@@
-12,8
+10,10
@@
config W1
This W1 support can also be built as a module. If so, the module
will be called wire.ko.
This W1 support can also be built as a module. If so, the module
will be called wire.ko.
+if W1
+
config W1_CON
config W1_CON
- depends on CONNECTOR
&& W1
+ depends on CONNECTOR
bool "Userspace communication over connector"
default y
--- help ---
bool "Userspace communication over connector"
default y
--- help ---
@@
-27,4
+27,4
@@
config W1_CON
source drivers/w1/masters/Kconfig
source drivers/w1/slaves/Kconfig
source drivers/w1/masters/Kconfig
source drivers/w1/slaves/Kconfig
-end
menu
+end
if # W1