summaryrefslogtreecommitdiffstats
path: root/fs/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-10-07 07:59:42 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-10-07 07:59:42 +0200
commitbf8988d820f2e8dd936405920c7f27fcb3135415 (patch)
tree5be62132611230e2b2e344f12cbad9e62d1f81e3 /fs/Makefile
parent574947ef76428803c3a2cbe8a02f294e3227d8e0 (diff)
parent12158a28d43880a20d8289519953fe020781be95 (diff)
downloadbarebox-bf8988d820f2e8dd936405920c7f27fcb3135415.tar.gz
barebox-bf8988d820f2e8dd936405920c7f27fcb3135415.tar.xz
Merge branch 'for-next/fs'
Conflicts: fs/Kconfig fs/Makefile
Diffstat (limited to 'fs/Makefile')
-rw-r--r--fs/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile
index 54cbb5282c..e8347bd670 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_FS_TFTP) += tftp.o
obj-$(CONFIG_FS_OMAP4_USBBOOT) += omap4_usbbootfs.o
obj-$(CONFIG_FS_NFS) += nfs.o
obj-$(CONFIG_FS_BPKFS) += bpkfs.o
+obj-$(CONFIG_FS_UIMAGEFS) += uimagefs.o