diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 16:53:53 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 16:53:53 -0500 |
| commit | c15cb37cc4e9809624411333b96109ddf770e29c (patch) | |
| tree | 3d4dbb48d97d5df9096ad815b99b20660cdc1bbf /drivers/w1/masters/Kconfig | |
| parent | 77be80e437fec44f8b7a620314b7d7b605b8d93b (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
Merge commit 'v2.6.28-rc8' into x86/uv
Diffstat (limited to 'drivers/w1/masters/Kconfig')
| -rw-r--r-- | drivers/w1/masters/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig index a14d5b6e4c7c..90616822cd20 100644 --- a/drivers/w1/masters/Kconfig +++ b/drivers/w1/masters/Kconfig | |||
| @@ -36,7 +36,7 @@ config W1_MASTER_DS2482 | |||
| 36 | 36 | ||
| 37 | config W1_MASTER_DS1WM | 37 | config W1_MASTER_DS1WM |
| 38 | tristate "Maxim DS1WM 1-wire busmaster" | 38 | tristate "Maxim DS1WM 1-wire busmaster" |
| 39 | depends on W1 && ARM | 39 | depends on W1 && ARM && HAVE_CLK |
| 40 | help | 40 | help |
| 41 | Say Y here to enable the DS1WM 1-wire driver, such as that | 41 | Say Y here to enable the DS1WM 1-wire driver, such as that |
| 42 | in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like | 42 | in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like |