diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:37:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:37:45 -0400 |
| commit | fb091be08d1acf184e8801dfdcace6e0cb19b1fe (patch) | |
| tree | cbd0c4200fd8628d592167589ca790e36fc4ae26 /drivers/media/IR/Makefile | |
| parent | bd7fc2f2d807fdb254f7efc542f8eec3f23e289e (diff) | |
| parent | e8d0416796d43a950ec7b65629e53419b2e22453 (diff) | |
Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (534 commits)
V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers
V4L/DVB: vivi and mem2mem_testdev need slab.h to build
V4L/DVB: tm6000: bugfix image position
V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET
V4L/DVB: tm6000: README - add vbi
V4L/DVB: Fix unlock logic at medusa_video_init
V4L/DVB: fix dvb frontend lockup
V4L/DVB: s2255drv: remove dead code
V4L/DVB: s2255drv: return if vdev not found
V4L/DVB: ov511: cleanup: remove unneeded null check
V4L/DVB: media/mem2mem: dereferencing free memory
V4L/DVB: media/IR: Add missing include file to rc-map.c
V4L/DVB: dvb/stv6110x: cleanup error handling
V4L/DVB: ngene: Add lgdt3303 and mt2131 deps to Kconfig
V4L/DVB: ngene: start separating out DVB functions into separate file
V4L/DVB: ngene: split out card specific code into a separate file
V4L/DVB: ngene: split out i2c code into a separate file
V4L/DVB: ngene: add initial support for digital side of Avermedia m780
V4L/DVB: ngene: properly support boards where channel 0 isn't a TS input
V4L-DVB: ngene: make sure that tuner headers are included
...
Diffstat (limited to 'drivers/media/IR/Makefile')
| -rw-r--r-- | drivers/media/IR/Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/media/IR/Makefile b/drivers/media/IR/Makefile index 171890e7a41d..b998fcced2e4 100644 --- a/drivers/media/IR/Makefile +++ b/drivers/media/IR/Makefile | |||
| @@ -1,5 +1,15 @@ | |||
| 1 | ir-common-objs := ir-functions.o ir-keymaps.o | 1 | ir-common-objs := ir-functions.o |
| 2 | ir-core-objs := ir-keytable.o ir-sysfs.o | 2 | ir-core-objs := ir-keytable.o ir-sysfs.o ir-raw-event.o rc-map.o |
| 3 | |||
| 4 | obj-y += keymaps/ | ||
| 3 | 5 | ||
| 4 | obj-$(CONFIG_IR_CORE) += ir-core.o | 6 | obj-$(CONFIG_IR_CORE) += ir-core.o |
| 5 | obj-$(CONFIG_VIDEO_IR) += ir-common.o | 7 | obj-$(CONFIG_VIDEO_IR) += ir-common.o |
| 8 | obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o | ||
| 9 | obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o | ||
| 10 | obj-$(CONFIG_IR_RC6_DECODER) += ir-rc6-decoder.o | ||
| 11 | obj-$(CONFIG_IR_JVC_DECODER) += ir-jvc-decoder.o | ||
| 12 | obj-$(CONFIG_IR_SONY_DECODER) += ir-sony-decoder.o | ||
| 13 | |||
| 14 | # stand-alone IR receivers/transmitters | ||
| 15 | obj-$(CONFIG_IR_IMON) += imon.o | ||