diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 19:42:35 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 19:42:35 +0200 |
| commit | b928ed56182b8ea59bd43f2d5b865f13a54d5719 (patch) | |
| tree | e9ba0ff9d316bdb84d6f2718d4543fd4213ba061 /drivers/mtd/Kconfig | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | UBI: remove unused variable (diff) | |
| download | linux-b928ed56182b8ea59bd43f2d5b865f13a54d5719.tar.xz linux-b928ed56182b8ea59bd43f2d5b865f13a54d5719.zip | |
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/Kconfig')
| -rw-r--r-- | drivers/mtd/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 26f75c299440..6d1b91bf7ad5 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -292,5 +292,7 @@ source "drivers/mtd/nand/Kconfig" source "drivers/mtd/onenand/Kconfig" +source "drivers/mtd/ubi/Kconfig" + endmenu |