diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-03-30 14:04:31 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-03-30 14:04:31 +0200 |
| commit | a23184ff45e565dc7275fa5b49aca4cd2762a4c6 (patch) | |
| tree | 8d47b65e6f94b45903cd032fc1926120adb8f9bd /drivers/mtd/ubi/Makefile | |
| parent | e797e34a3f7cb82c4e5b249a525c9e857ac6eebd (diff) | |
| parent | f1a60a56b7ac367b5285694cd02574e4edbe4c47 (diff) | |
Merge remote-tracking branch 'remotes/ubifs-v3.1/master' into tegra-nand-next
Conflicts:
drivers/mtd/ubi/ubi.h
drivers/mtd/ubi/wl.c
Diffstat (limited to 'drivers/mtd/ubi/Makefile')
| -rw-r--r-- | drivers/mtd/ubi/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/Makefile b/drivers/mtd/ubi/Makefile index c9302a5452b0..b46b0c978581 100644 --- a/drivers/mtd/ubi/Makefile +++ b/drivers/mtd/ubi/Makefile @@ -1,7 +1,7 @@ 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 += misc.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 +ubi-$(CONFIG_MTD_UBI_FASTMAP) += fastmap.o -ubi-$(CONFIG_MTD_UBI_DEBUG) += debug.o obj-$(CONFIG_MTD_UBI_GLUEBI) += gluebi.o |