Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

This commit is contained in:
David Woodhouse
2008-07-25 10:40:14 -04:00
6656 changed files with 513158 additions and 432143 deletions
-1
View File
@@ -63,6 +63,5 @@ obj-$(CONFIG_MTD_DMV182) += dmv182.o
obj-$(CONFIG_MTD_SHARP_SL) += sharpsl-flash.o
obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-async-flash.o