diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
| commit | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (patch) | |
| tree | f5ec7ac45234c25794c97f87e9a6daa8a551e57c /miscutils/nandwrite.c | |
| parent | 72394258b6509b40e0fa08594ac86215a558dfd8 (diff) | |
| parent | 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (diff) | |
| download | busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.gz busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.bz2 busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.zip | |
Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge
Conflicts:
include/platform.h
libbb/Kbuild.src
libbb/messages.c
Diffstat (limited to 'miscutils/nandwrite.c')
| -rw-r--r-- | miscutils/nandwrite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c index 831d2f76b..c5e2fb841 100644 --- a/miscutils/nandwrite.c +++ b/miscutils/nandwrite.c | |||
| @@ -8,8 +8,8 @@ | |||
| 8 | * TODO: add support for large (>4GB) MTD devices | 8 | * TODO: add support for large (>4GB) MTD devices |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | //applet:IF_NANDWRITE(APPLET(nandwrite, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) | 11 | //applet:IF_NANDWRITE(APPLET(nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
| 12 | //applet:IF_NANDWRITE(APPLET_ODDNAME(nanddump, nandwrite, _BB_DIR_USR_SBIN, _BB_SUID_DROP, nanddump)) | 12 | //applet:IF_NANDWRITE(APPLET_ODDNAME(nanddump, nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP, nanddump)) |
| 13 | 13 | ||
| 14 | //kbuild:lib-$(CONFIG_NANDWRITE) += nandwrite.o | 14 | //kbuild:lib-$(CONFIG_NANDWRITE) += nandwrite.o |
| 15 | //kbuild:lib-$(CONFIG_NANDDUMP) += nandwrite.o | 15 | //kbuild:lib-$(CONFIG_NANDDUMP) += nandwrite.o |