diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /miscutils/flash_eraseall.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'miscutils/flash_eraseall.c')
| -rw-r--r-- | miscutils/flash_eraseall.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c index b832cc1dd..68596e11b 100644 --- a/miscutils/flash_eraseall.c +++ b/miscutils/flash_eraseall.c | |||
| @@ -14,10 +14,10 @@ | |||
| 14 | #include <mtd/mtd-user.h> | 14 | #include <mtd/mtd-user.h> |
| 15 | #include <linux/jffs2.h> | 15 | #include <linux/jffs2.h> |
| 16 | 16 | ||
| 17 | #define OPTION_J (1 << 0) | 17 | #define OPTION_J (1 << 0) |
| 18 | #define OPTION_Q (1 << 1) | 18 | #define OPTION_Q (1 << 1) |
| 19 | #define IS_NAND (1 << 2) | 19 | #define IS_NAND (1 << 2) |
| 20 | #define BBTEST (1 << 3) | 20 | #define BBTEST (1 << 3) |
| 21 | 21 | ||
| 22 | /* mtd/jffs2-user.h used to have this atrocity: | 22 | /* mtd/jffs2-user.h used to have this atrocity: |
| 23 | extern int target_endian; | 23 | extern int target_endian; |