diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 10:42:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 10:42:35 -0700 |
commit | b928ed56182b8ea59bd43f2d5b865f13a54d5719 (patch) | |
tree | e9ba0ff9d316bdb84d6f2718d4543fd4213ba061 /drivers/mtd/Makefile | |
parent | ea6db58f3ea55f413c882095d2afaea8137f4f8c (diff) | |
parent | d468a030026017008286919aa6127b1190efb2c2 (diff) | |
download | op-kernel-dev-b928ed56182b8ea59bd43f2d5b865f13a54d5719.zip op-kernel-dev-b928ed56182b8ea59bd43f2d5b865f13a54d5719.tar.gz |
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
* 'for-linus' of git://git.infradead.org/ubi-2.6:
UBI: remove unused variable
UBI: add me to MAINTAINERS
JFFS2: add UBI support
UBI: Unsorted Block Images
Diffstat (limited to 'drivers/mtd/Makefile')
-rw-r--r-- | drivers/mtd/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index c130e62..9205540 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -28,3 +28,5 @@ nftl-objs := nftlcore.o nftlmount.o inftl-objs := inftlcore.o inftlmount.o obj-y += chips/ maps/ devices/ nand/ onenand/ + +obj-$(CONFIG_MTD_UBI) += ubi/ |