Merge branch 'linus' into x86/kconfig

[linux-2.6] / drivers / mtd / onenand / Makefile

diff --git a/drivers/mtd/onenand/Makefile b/drivers/mtd/onenand/Makefile
index 932301a888ed5d844928852a0fcf81bbb4ea7194..4d2eacfd7e11a761c3cec319f34c735d0fc0222b 100644 (file)
--- a/drivers/mtd/onenand/Makefile
+++ b/drivers/mtd/onenand/Makefile
@@ -6,7 +6,7 @@
 obj-$(CONFIG_MTD_ONENAND)              += onenand.o
 
 # Board specific.
-obj-$(CONFIG_MTD_ONENAND_OMAP)         += omap-onenand.o
+obj-$(CONFIG_MTD_ONENAND_GENERIC)      += generic.o
 
 # Simulator
 obj-$(CONFIG_MTD_ONENAND_SIM)          += onenand_sim.o