diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:30 +0200 |
| commit | 6ab561c8aab2e4af535f09adbc6253f958536848 (patch) | |
| tree | 37846adb4ea106485720d113e252d71d615c23ed /drivers/media/IR/Makefile | |
| parent | 4f4e8f69895c8696a4bcc751817d4b186023ac44 (diff) | |
| parent | cbaa9f60d5d5c3af10f94e0d49789d5b82341a4a (diff) | |
Merge branch 'topic/isa' into topic/misc
Diffstat (limited to 'drivers/media/IR/Makefile')
| -rw-r--r-- | drivers/media/IR/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/IR/Makefile b/drivers/media/IR/Makefile index b998fcced2e..2ae4f3abfdb 100644 --- a/drivers/media/IR/Makefile +++ b/drivers/media/IR/Makefile @@ -5,11 +5,14 @@ obj-y += keymaps/ obj-$(CONFIG_IR_CORE) += ir-core.o obj-$(CONFIG_VIDEO_IR) += ir-common.o +obj-$(CONFIG_LIRC) += lirc_dev.o obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o obj-$(CONFIG_IR_RC6_DECODER) += ir-rc6-decoder.o obj-$(CONFIG_IR_JVC_DECODER) += ir-jvc-decoder.o obj-$(CONFIG_IR_SONY_DECODER) += ir-sony-decoder.o +obj-$(CONFIG_IR_LIRC_CODEC) += ir-lirc-codec.o # stand-alone IR receivers/transmitters obj-$(CONFIG_IR_IMON) += imon.o +obj-$(CONFIG_IR_MCEUSB) += mceusb.o |