diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 09:48:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 09:48:30 -0700 |
| commit | b069e8ed4d5054b1fcd31a98bb2053bde645202f (patch) | |
| tree | 69d6691c02220e8d1979683fd1b0dc2efbf4e5c5 /drivers/mtd/ubi/Makefile | |
| parent | b7c142dbf1e7422d0be7f7faa3f1163ad9da9788 (diff) | |
| parent | d9dd0887cc5c6df0dbbe5a307284610607eea7ab (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
* 'linux-next' of git://git.infradead.org/ubi-2.6: (21 commits)
UBI: add reboot notifier
UBI: handle more error codes
UBI: fix multiple spelling typos
UBI: fix kmem_cache_free on error patch
UBI: print amount of reserved PEBs
UBI: improve messages in the WL worker
UBI: make gluebi a separate module
UBI: remove built-in gluebi
UBI: add notification API
UBI: do not switch to R/O mode on read errors
UBI: fix and clean-up error paths in WL worker
UBI: introduce new constants
UBI: fix race condition
UBI: minor serialization fix
UBI: do not panic if volume check fails
UBI: add dump_stack in checking code
UBI: fix races in I/O debugging checks
UBI: small debugging code optimization
UBI: improve debugging messages
UBI: re-name volumes_mutex to device_mutex
...
Diffstat (limited to 'drivers/mtd/ubi/Makefile')
| -rw-r--r-- | drivers/mtd/ubi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/Makefile b/drivers/mtd/ubi/Makefile index dd834e04151..c9302a5452b 100644 --- a/drivers/mtd/ubi/Makefile +++ b/drivers/mtd/ubi/Makefile @@ -4,4 +4,4 @@ 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-$(CONFIG_MTD_UBI_DEBUG) += debug.o -ubi-$(CONFIG_MTD_UBI_GLUEBI) += gluebi.o +obj-$(CONFIG_MTD_UBI_GLUEBI) += gluebi.o |