diff --git a/[refs] b/[refs] index f303fd04f3dd..0c47b4206bd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0479ab48bb30019820c296a081ebd70a9cc6872a +refs/heads/master: ae4a8104e3d913d75ad72b43ea112968c14bd5de diff --git a/trunk/drivers/mtd/ubi/Makefile b/trunk/drivers/mtd/ubi/Makefile index da71655e42db..a0803ac74712 100644 --- a/trunk/drivers/mtd/ubi/Makefile +++ b/trunk/drivers/mtd/ubi/Makefile @@ -1,6 +1,6 @@ obj-$(CONFIG_MTD_UBI) += ubi.o -ubi-y += vtbl.o vmt.o upd.o build.o cdev.o kapi.o eba.o io.o wl.o scan.o +ubi-y += vtbl.o vmt.o upd.o build.o cdev.o kapi.o eba.o io.o wl.o attach.o ubi-y += misc.o debug.o obj-$(CONFIG_MTD_UBI_GLUEBI) += gluebi.o diff --git a/trunk/drivers/mtd/ubi/scan.c b/trunk/drivers/mtd/ubi/attach.c similarity index 100% rename from trunk/drivers/mtd/ubi/scan.c rename to trunk/drivers/mtd/ubi/attach.c