diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-14 09:51:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-08 13:34:45 +0200 |
| commit | 6ab4aa819a8f4ea322c65fad29077754bdefd990 (patch) | |
| tree | 7256ba192b70c86915f46b7aa669864764a1f9a3 | |
| parent | 38eae8b2ca2304356cfbadec9c99985e7cf81b2c (diff) | |
| download | barebox-6ab4aa819a8f4ea322c65fad29077754bdefd990.tar.gz barebox-6ab4aa819a8f4ea322c65fad29077754bdefd990.tar.xz | |
mtd: ubi: rename cdev.c to barebox.c
cdev.c exists in the kernel UBI code, but barebox has completely
different content in this file. rename it to barebox.c to reduce the
number of merge conflicts. Also with the name barebox.c we now have
a place to put other barebox specific UBI code to.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/mtd/ubi/Makefile | 2 | ||||
| -rw-r--r-- | drivers/mtd/ubi/barebox.c (renamed from drivers/mtd/ubi/cdev.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/Makefile b/drivers/mtd/ubi/Makefile index 795b116ecc..33ac39026c 100644 --- a/drivers/mtd/ubi/Makefile +++ b/drivers/mtd/ubi/Makefile @@ -1,5 +1,5 @@ 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 attach.o +ubi-y += vtbl.o vmt.o upd.o build.o barebox.o kapi.o eba.o io.o wl.o attach.o ubi-y += misc.o debug.o ubi-$(CONFIG_MTD_UBI_FASTMAP) += fastmap.o diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/barebox.c index fe71a8d609..fe71a8d609 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/barebox.c |