diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 22:51:26 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 22:51:26 +0400 |
| commit | 4d429480352c63db2228489f0db9fd381cdc3c9c (patch) | |
| tree | 96a3bc976735ef01d5d5e42353ae1dd795d34370 /include/linux/mtd | |
| parent | eb08d8ff476ad39a149e1044c7d3fd742a168864 (diff) | |
| parent | ab50ff684707031ed4bad2fdd313208ae392e5bb (diff) | |
| download | linux-4d429480352c63db2228489f0db9fd381cdc3c9c.tar.xz | |
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
* 'linux-next' of git://git.infradead.org/ubi-2.6:
UBI: switch to dynamic printks
UBI: turn some macros into static inline
UBI: improve checking in debugging prints
UBI: fix typo in a message
UBI: fix minor stylistic issues
UBI: use __packed instead of __attribute__((packed))
UBI: cleanup comments around volume properties
UBI: re-name set volume properties ioctl
UBI: make the control character device non-seekable
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/ubi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h index 84854edf4436..15da0e99f48a 100644 --- a/include/linux/mtd/ubi.h +++ b/include/linux/mtd/ubi.h @@ -21,7 +21,7 @@ #ifndef __LINUX_UBI_H__ #define __LINUX_UBI_H__ -#include <asm/ioctl.h> +#include <linux/ioctl.h> #include <linux/types.h> #include <mtd/ubi-user.h> @@ -87,7 +87,7 @@ enum { * physical eraseblock size and on how much bytes UBI headers consume. But * because of the volume alignment (@alignment), the usable size of logical * eraseblocks if a volume may be less. The following equation is true: - * @usable_leb_size = LEB size - (LEB size mod @alignment), + * @usable_leb_size = LEB size - (LEB size mod @alignment), * where LEB size is the logical eraseblock size defined by the UBI device. * * The alignment is multiple to the minimal flash input/output unit size or %1 |