git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge current mainline tree into linux-omap tree
[pandora-kernel.git]
/
drivers
/
net
/
irda
/
Makefile
diff --git
a/drivers/net/irda/Makefile
b/drivers/net/irda/Makefile
index
5d20fde
..
49e6f06
100644
(file)
--- a/
drivers/net/irda/Makefile
+++ b/
drivers/net/irda/Makefile
@@
-18,6
+18,7
@@
obj-$(CONFIG_VLSI_FIR) += vlsi_ir.o
obj-$(CONFIG_VIA_FIR) += via-ircc.o
obj-$(CONFIG_PXA_FICP) += pxaficp_ir.o
obj-$(CONFIG_MCS_FIR) += mcs7780.o
+obj-$(CONFIG_OMAP_IR) += omap-ir.o
obj-$(CONFIG_AU1000_FIR) += au1k_ir.o
# SIR drivers
obj-$(CONFIG_IRTTY_SIR) += irtty-sir.o sir-dev.o