diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 03:43:52 +0100 |
| commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
| tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /drivers/w1/masters/Kconfig | |
| parent | e8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
| download | op-kernel-dev-99cd7074891f87c49660e3b2880564324a4733ac.zip op-kernel-dev-99cd7074891f87c49660e3b2880564324a4733ac.tar.gz | |
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'drivers/w1/masters/Kconfig')
| -rw-r--r-- | drivers/w1/masters/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig index 9061682..96d2f8e 100644 --- a/drivers/w1/masters/Kconfig +++ b/drivers/w1/masters/Kconfig @@ -34,6 +34,12 @@ config W1_MASTER_DS2482 This driver can also be built as a module. If so, the module will be called ds2482. +config W1_MASTER_MXC + tristate "Freescale MXC 1-wire busmaster" + depends on W1 && ARCH_MXC + help + Say Y here to enable MXC 1-wire host + config W1_MASTER_DS1WM tristate "Maxim DS1WM 1-wire busmaster" depends on W1 && ARM && HAVE_CLK |
