5 files changed, 140 insertions, 0 deletions

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 984a7544071..92965172585 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -147,5 +147,7 @@ source "drivers/staging/mrst-touchscreen/Kconfig"
 
 source "drivers/staging/msm/Kconfig"
 
+source "drivers/staging/lirc/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 9fa25133874..6c5b5237ccb 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_VIDEO_GO7007)      += go7007/
 obj-$(CONFIG_VIDEO_CX25821)     += cx25821/
 obj-$(CONFIG_VIDEO_TM6000)      += tm6000/
+obj-$(CONFIG_LIRC_STAGING)      += lirc/
 obj-$(CONFIG_USB_IP_COMMON)     += usbip/
 obj-$(CONFIG_W35UND)            += winbond/
 obj-$(CONFIG_PRISM2_USB)        += wlan-ng/
diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig
new file mode 100644
index 00000000000..968c2adee06
--- /dev/null
+++ b/drivers/staging/lirc/Kconfig
@@ -0,0 +1,110 @@
+#
+# LIRC driver(s) configuration
+#
+menuconfig LIRC_STAGING
+        bool "Linux Infrared Remote Control IR receiver/transmitter drivers"
+        help
+          Say Y here, and all supported Linux Infrared Remote Control IR and
+          RF receiver and transmitter drivers will be displayed. When paired
+          with a remote control and the lirc daemon, the receiver drivers
+          allow control of your Linux system via remote control.
+
+if LIRC_STAGING
+
+config LIRC_BT829
+        tristate "BT829 based hardware"
+        depends on LIRC_STAGING
+        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
+        help
+          Driver for I2C-based IR receivers, such as those commonly
+          found onboard Hauppauge PVR-150/250/350 video capture cards
+
+config LIRC_IGORPLUGUSB
+        tristate "Igor Cesko's USB IR Receiver"
+        depends on LIRC_STAGING && USB
+        help
+          Driver for Igor Cesko's USB IR Receiver
+
+config LIRC_IMON
+        tristate "Legacy SoundGraph iMON Receiver and Display"
+        depends on LIRC_STAGING
+        help
+          Driver for the original SoundGraph iMON IR Receiver and Display
+
+          Current generation iMON devices use the input layer imon driver.
+
+config LIRC_IT87
+        tristate "ITE IT87XX CIR Port Receiver"
+        depends on LIRC_STAGING
+        help
+          Driver for the ITE IT87xx IR Receiver
+
+config LIRC_ITE8709
+        tristate "ITE8709 CIR Port Receiver"
+        depends on LIRC_STAGING && PNP
+        help
+          Driver for the ITE8709 IR Receiver
+
+config LIRC_PARALLEL
+        tristate "Homebrew Parallel Port Receiver"
+        depends on LIRC_STAGING && !SMP
+        help
+          Driver for Homebrew Parallel Port Receivers
+
+config LIRC_SASEM
+        tristate "Sasem USB IR Remote"
+        depends on LIRC_STAGING
+        help
+          Driver for the Sasem OnAir Remocon-V or Dign HV5 HTPC IR/VFD Module
+
+config LIRC_SERIAL
+        tristate "Homebrew Serial Port Receiver"
+        depends on LIRC_STAGING
+        help
+          Driver for Homebrew Serial Port Receivers
+
+config LIRC_SERIAL_TRANSMITTER
+        bool "Serial Port Transmitter"
+        default y
+        depends on LIRC_SERIAL
+        help
+          Serial Port Transmitter support
+
+config LIRC_SIR
+        tristate "Built-in SIR IrDA port"
+        depends on LIRC_STAGING
+        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
+        help
+          Driver for the Technotrend USB IR Receiver
+
+config LIRC_ZILOG
+        tristate "Zilog/Hauppauge IR Transmitter"
+        depends on LIRC_STAGING
+        help
+          Driver for the Zilog/Hauppauge IR Transmitter, found on
+          PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
+endif
diff --git a/drivers/staging/lirc/Makefile b/drivers/staging/lirc/Makefile
new file mode 100644
index 00000000000..a019182a7a3
--- /dev/null
+++ b/drivers/staging/lirc/Makefile
@@ -0,0 +1,19 @@
+# Makefile for the lirc drivers.
+#
+
+# Each configuration option enables a list of files.
+
+obj-$(CONFIG_LIRC_BT829)        += lirc_bt829.o
+obj-$(CONFIG_LIRC_ENE0100)      += lirc_ene0100.o
+obj-$(CONFIG_LIRC_I2C)          += lirc_i2c.o
+obj-$(CONFIG_LIRC_IGORPLUGUSB)  += lirc_igorplugusb.o
+obj-$(CONFIG_LIRC_IMON)         += lirc_imon.o
+obj-$(CONFIG_LIRC_IT87)         += lirc_it87.o
+obj-$(CONFIG_LIRC_ITE8709)      += lirc_ite8709.o
+obj-$(CONFIG_LIRC_PARALLEL)     += lirc_parallel.o
+obj-$(CONFIG_LIRC_SASEM)        += lirc_sasem.o
+obj-$(CONFIG_LIRC_SERIAL)       += lirc_serial.o
+obj-$(CONFIG_LIRC_SIR)          += lirc_sir.o
+obj-$(CONFIG_LIRC_STREAMZAP)    += lirc_streamzap.o
+obj-$(CONFIG_LIRC_TTUSBIR)      += lirc_ttusbir.o
+obj-$(CONFIG_LIRC_ZILOG)        += lirc_zilog.o
diff --git a/drivers/staging/lirc/TODO b/drivers/staging/lirc/TODO
new file mode 100644
index 00000000000..b6cb593f55c
--- /dev/null
+++ b/drivers/staging/lirc/TODO
@@ -0,0 +1,8 @@
+- All drivers should either be ported to ir-core, or dropped entirely
+  (see drivers/media/IR/mceusb.c vs. lirc_mceusb.c in lirc cvs for an
+  example of a previously completed port).
+
+Please send patches to:
+Jarod Wilson <jarod@wilsonet.com>
+Greg Kroah-Hartman <greg@kroah.com>
+