Merge branch 'akpm' (Andrew's patch-bomb)

[~andy/linux] / drivers / media / rc / Makefile

diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 29f364f88a94d0e8c492829c2a1fd280d1765704..f871d1986c21901011477f61f60374d032c28c14 100644 (file)
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -27,3 +27,4 @@ obj-$(CONFIG_IR_STREAMZAP) += streamzap.o
 obj-$(CONFIG_IR_WINBOND_CIR) += winbond-cir.o
 obj-$(CONFIG_RC_LOOPBACK) += rc-loopback.o
 obj-$(CONFIG_IR_GPIO_CIR) += gpio-ir-recv.o
+obj-$(CONFIG_IR_IGUANA) += iguanair.o