diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-08-27 02:22:20 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-08-27 02:22:20 -0400 |
| commit | 93bb70e0c00f1be4cc857e4d8375c44058cce71e (patch) | |
| tree | 7b6a11844e00b3f4bf8281c7a799e61494220819 /drivers/media/rc/Kconfig | |
| parent | 6f314ebbaa2667d67a7206ba78f28e46cf47eda5 (diff) | |
| parent | c182ae42cc3611f7b3fa803c0bcab6e5d29bea63 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
Diffstat (limited to 'drivers/media/rc/Kconfig')
| -rw-r--r-- | drivers/media/rc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig index 5180390be7ab..8be57634ba60 100644 --- a/drivers/media/rc/Kconfig +++ b/drivers/media/rc/Kconfig | |||
| @@ -261,6 +261,7 @@ config IR_WINBOND_CIR | |||
| 261 | 261 | ||
| 262 | config IR_IGUANA | 262 | config IR_IGUANA |
| 263 | tristate "IguanaWorks USB IR Transceiver" | 263 | tristate "IguanaWorks USB IR Transceiver" |
| 264 | depends on USB_ARCH_HAS_HCD | ||
| 264 | depends on RC_CORE | 265 | depends on RC_CORE |
| 265 | select USB | 266 | select USB |
| 266 | ---help--- | 267 | ---help--- |