aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLove Mansson <love.mansson@stericsson.com>2010-04-21 13:39:54 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:04 -0600
commite0fb9e9d0d175f4a0c28196aa8cb3461c3773bed (patch)
tree5784ae372438d03c9ce0e30cdcb6fc72719b3c5e
parentf5eeb18fd04ba2d655d9cea36cee498192706e97 (diff)
downloadlinux-2.6.34-ux500-e0fb9e9d0d175f4a0c28196aa8cb3461c3773bed.tar.gz
Additional commit for IrRC driver patch:
Adding the IrRC driver to the misc driver area.
-rw-r--r--drivers/misc/Kconfig4
-rw-r--r--drivers/misc/Makefile1
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 4b9cb1a5d6b..818f9c3d4c1 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -385,6 +385,10 @@ config AB8500_GPADC
help
AB8500 GPADC driver used to convert Acc and battery/ac/usb voltage
+config STE_IRRC
+ bool "STEricsson Infra Red Remote Control Driver"
+ default n
+
source "drivers/misc/c2port/Kconfig"
source "drivers/misc/eeprom/Kconfig"
source "drivers/misc/cb710/Kconfig"
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index acc1c704e35..7d3a77fe984 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -38,3 +38,4 @@ obj-$(CONFIG_AB8500) += ab8500-dev.o
obj-$(CONFIG_AB8500_GPADC) += ab8500_gpadc.o
obj-$(CONFIG_ISA_HSI_MODEM) += msw/
obj-$(CONFIG_U8500_SHRM) += shrm/
+obj-$(CONFIG_STE_IRRC) += irrc.o