diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 04:33:23 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 04:33:23 +0000 |
| commit | 167ce4221660a9c36facce91167bb9dd3557547a (patch) | |
| tree | 3362d3a5cd0117466f9eae58ed5cbd94cd781723 /bsdfsck/preen.c | |
| parent | 7e76a2bd1ec93f7d272e8eb16542f9c231d55ae9 (diff) | |
| parent | 8e4d8ce5e5643ae5be3d077a03d0266cfa7a74b4 (diff) | |
Merge branch 'dde' into dde-debian
Conflicts:
dde_e100/Makefile
dde_e1000/Makefile
dde_ne2k_pci/Makefile
dde_pcnet32/Makefile
dde_rtl8139/Makefile
libddekit/mach.defs
libmachdev/mach.defs
Diffstat (limited to 'bsdfsck/preen.c')
| -rw-r--r-- | bsdfsck/preen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bsdfsck/preen.c b/bsdfsck/preen.c index 7893a5e1..5650f900 100644 --- a/bsdfsck/preen.c +++ b/bsdfsck/preen.c @@ -51,7 +51,7 @@ struct part { struct part *next; /* forward link of partitions on disk */ char *name; /* device name */ char *fsname; /* mounted filesystem name */ - long auxdata; /* auxillary data for application */ + long auxdata; /* auxiliary data for application */ } *badlist, **badnext = &badlist; struct disk { |