diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:03:18 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-02-09 09:05:39 +0000 |
| commit | 492d0a7492a57fe8f02c766e25960b0ce0d88759 (patch) | |
| tree | 4f5764a5c2250c031ea05e9aeacbb40d7971f493 /e2fsprogs | |
| parent | 4734416a21312488a5099a297907783bee4ccc22 (diff) | |
| parent | caa9c4f707b661cf398f2c2d66f54f5b0d8adfe2 (diff) | |
| download | busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.gz busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.tar.bz2 busybox-w32-492d0a7492a57fe8f02c766e25960b0ce0d88759.zip | |
Merge busybox into merge
Fix conflicts in reset and ash.
Redefine the new safe_read_key() as a reference to read_key().
Disable SHA256_HWACCEL.
Diffstat (limited to 'e2fsprogs')
| -rw-r--r-- | e2fsprogs/fsck.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c index 96c1e51e0..028f8a803 100644 --- a/e2fsprogs/fsck.c +++ b/e2fsprogs/fsck.c | |||
| @@ -190,7 +190,7 @@ struct globals { | |||
| 190 | * Required for the uber-silly devfs /dev/ide/host1/bus2/target3/lun3 | 190 | * Required for the uber-silly devfs /dev/ide/host1/bus2/target3/lun3 |
| 191 | * pathames. | 191 | * pathames. |
| 192 | */ | 192 | */ |
| 193 | static const char *const devfs_hier[] = { | 193 | static const char *const devfs_hier[] ALIGN_PTR = { |
| 194 | "host", "bus", "target", "lun", NULL | 194 | "host", "bus", "target", "lun", NULL |
| 195 | }; | 195 | }; |
| 196 | #endif | 196 | #endif |