diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-23 12:12:03 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 12:12:03 +0000 |
| commit | b0f54743e36af163ae2530c381c485bb29df13dc (patch) | |
| tree | cda4cfeaae6e47fe4f14c1b566092be4da9affc4 /miscutils/ubi_tools.c | |
| parent | 40514a0309939f2446f0d4ed9600cad5de396e7f (diff) | |
| parent | ba88826c66411affc1da3614742b454654f7298a (diff) | |
| download | busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.tar.gz busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.tar.bz2 busybox-w32-b0f54743e36af163ae2530c381c485bb29df13dc.zip | |
Merge branch 'busybox' into merge
Conflicts:
Makefile.flags
Diffstat (limited to 'miscutils/ubi_tools.c')
| -rw-r--r-- | miscutils/ubi_tools.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c index 2a426dbdc..dd99a44f4 100644 --- a/miscutils/ubi_tools.c +++ b/miscutils/ubi_tools.c | |||
| @@ -60,6 +60,10 @@ | |||
| 60 | //kbuild:lib-$(CONFIG_UBIUPDATEVOL) += ubi_tools.o | 60 | //kbuild:lib-$(CONFIG_UBIUPDATEVOL) += ubi_tools.o |
| 61 | 61 | ||
| 62 | #include "libbb.h" | 62 | #include "libbb.h" |
| 63 | /* Some versions of kernel have broken headers, need this hack */ | ||
| 64 | #ifndef __packed | ||
| 65 | # define __packed __attribute__((packed)) | ||
| 66 | #endif | ||
| 63 | #include <mtd/ubi-user.h> | 67 | #include <mtd/ubi-user.h> |
| 64 | 68 | ||
| 65 | #define OPTION_M (1 << 0) | 69 | #define OPTION_M (1 << 0) |