Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / drivers / staging / lirc / Kconfig

diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig
index 968c2ad..fa790db 100644 (file)
--- a/drivers/staging/lirc/Kconfig
+++ b/drivers/staging/lirc/Kconfig
@@ -3,6 +3,7 @@
 #
 menuconfig LIRC_STAGING
        bool "Linux Infrared Remote Control IR receiver/transmitter drivers"
+       depends on LIRC
        help
          Say Y here, and all supported Linux Infrared Remote Control IR and
          RF receiver and transmitter drivers will be displayed. When paired
@@ -13,21 +14,13 @@ if LIRC_STAGING
 
 config LIRC_BT829
         tristate "BT829 based hardware"
-       depends on LIRC_STAGING
+       depends on LIRC_STAGING && PCI
        help
          Driver for the IR interface on BT829-based hardware
 
-config LIRC_ENE0100
-       tristate "ENE KB3924/ENE0100 CIR Port Reciever"
-       depends on LIRC_STAGING
-       help
-         This is a driver for CIR port handled by ENE KB3924 embedded
-         controller found on some notebooks.
-         It appears on PNP list as ENE0100.
-
 config LIRC_I2C
        tristate "I2C Based IR Receivers"
-       depends on LIRC_STAGING
+       depends on LIRC_STAGING && I2C
        help
          Driver for I2C-based IR receivers, such as those commonly
          found onboard Hauppauge PVR-150/250/350 video capture cards
@@ -40,7 +33,7 @@ config LIRC_IGORPLUGUSB
 
 config LIRC_IMON
        tristate "Legacy SoundGraph iMON Receiver and Display"
-       depends on LIRC_STAGING
+       depends on LIRC_STAGING && USB
        help
          Driver for the original SoundGraph iMON IR Receiver and Display
 
@@ -48,7 +41,7 @@ config LIRC_IMON
 
 config LIRC_IT87
        tristate "ITE IT87XX CIR Port Receiver"
-       depends on LIRC_STAGING
+       depends on LIRC_STAGING && PNP
        help
          Driver for the ITE IT87xx IR Receiver
 
@@ -60,13 +53,13 @@ config LIRC_ITE8709
 
 config LIRC_PARALLEL
        tristate "Homebrew Parallel Port Receiver"
-       depends on LIRC_STAGING && !SMP
+       depends on LIRC_STAGING && PARPORT
        help
          Driver for Homebrew Parallel Port Receivers
 
 config LIRC_SASEM
        tristate "Sasem USB IR Remote"
-       depends on LIRC_STAGING
+       depends on LIRC_STAGING && USB
        help
          Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
 
@@ -89,12 +82,6 @@ config LIRC_SIR
        help
          Driver for the SIR IrDA port
 
-config LIRC_STREAMZAP
-       tristate "Streamzap PC Receiver"
-       depends on LIRC_STAGING
-       help
-         Driver for the Streamzap PC Receiver
-
 config LIRC_TTUSBIR
        tristate "Technotrend USB IR Receiver"
        depends on LIRC_STAGING && USB
@@ -103,7 +90,7 @@ config LIRC_TTUSBIR
 
 config LIRC_ZILOG
        tristate "Zilog/Hauppauge IR Transmitter"
-       depends on LIRC_STAGING
+       depends on LIRC_STAGING && I2C
        help
          Driver for the Zilog/Hauppauge IR Transmitter, found on
          PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards