diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-06-15 18:08:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-15 23:04:00 -0400 |
| commit | 26575f9544530127757297d4de8fb2f2c75f1f69 (patch) | |
| tree | c227c2a5683840828baae1af2b300763dbf716fe /drivers/w1 | |
| parent | 49b24d6b41c576ba43153fc94695f871cce139a5 (diff) | |
w1: W1_MASTER_DS1WM should depend on GENERIC_HARDIRQS
On m68k (which doesn't support generic hardirqs yet):
drivers/w1/masters/ds1wm.c: In function `ds1wm_probe':
drivers/w1/masters/ds1wm.c: error: implicit declaration of function `irq_set_irq_type'
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Cc: Jean-Franois Dagenais <dagenaisj@sonatest.com>
Cc: Matt Reimer <mreimer@vpop.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/w1')
| -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 00d615d7aa21..979d6eed9a0f 100644 --- a/drivers/w1/masters/Kconfig +++ b/drivers/w1/masters/Kconfig | |||
| @@ -42,7 +42,7 @@ config W1_MASTER_MXC | |||
| 42 | 42 | ||
| 43 | config W1_MASTER_DS1WM | 43 | config W1_MASTER_DS1WM |
| 44 | tristate "Maxim DS1WM 1-wire busmaster" | 44 | tristate "Maxim DS1WM 1-wire busmaster" |
| 45 | depends on W1 | 45 | depends on W1 && GENERIC_HARDIRQS |
| 46 | help | 46 | help |
| 47 | Say Y here to enable the DS1WM 1-wire driver, such as that | 47 | Say Y here to enable the DS1WM 1-wire driver, such as that |
| 48 | in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like | 48 | in HP iPAQ devices like h5xxx, h2200, and ASIC3-based like |