Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / misc / Makefile

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index b162e23af35c1339ee1608bff98feede664737db..8143c4d157a522c4357cba37fe3a26b84d69a75e 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -19,5 +19,6 @@ obj-$(CONFIG_KGDB_TESTS)      += kgdbts.o
 obj-$(CONFIG_SGI_XP)           += sgi-xp/
 obj-$(CONFIG_SGI_GRU)          += sgi-gru/
 obj-$(CONFIG_HP_ILO)           += hpilo.o
+obj-$(CONFIG_ISL29003)         += isl29003.o
 obj-$(CONFIG_C2PORT)           += c2port/
 obj-y                          += eeprom/