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 /util-linux/fdformat.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 'util-linux/fdformat.c')
| -rw-r--r-- | util-linux/fdformat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c index f5c386c46..57e9c26f8 100644 --- a/util-linux/fdformat.c +++ b/util-linux/fdformat.c | |||
| @@ -36,7 +36,7 @@ struct format_descr { | |||
| 36 | unsigned int device,head,track; | 36 | unsigned int device,head,track; |
| 37 | }; | 37 | }; |
| 38 | #define FDFMTBEG _IO(2,0x47) | 38 | #define FDFMTBEG _IO(2,0x47) |
| 39 | #define FDFMTTRK _IOW(2,0x48, struct format_descr) | 39 | #define FDFMTTRK _IOW(2,0x48, struct format_descr) |
| 40 | #define FDFMTEND _IO(2,0x49) | 40 | #define FDFMTEND _IO(2,0x49) |
| 41 | #define FDGETPRM _IOR(2, 0x04, struct floppy_struct) | 41 | #define FDGETPRM _IOR(2, 0x04, struct floppy_struct) |
| 42 | #define FD_FILL_BYTE 0xF6 /* format fill byte. */ | 42 | #define FD_FILL_BYTE 0xF6 /* format fill byte. */ |