diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-08-12 20:48:33 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-08-12 20:52:53 -0700 |
| commit | a104d9a4fd0762b4167668bb43eaeef10469ee9c (patch) | |
| tree | 397f11badacb1c864e689a0aaaba17e051cff171 /core/include/fs.h | |
| parent | 0fb20934d2145e43f08650dbbf6613f24f2df8c6 (diff) | |
| parent | f3ab4925bd8c5c42cf17a34377f82b53b48b132e (diff) | |
| download | syslinux-a104d9a4fd0762b4167668bb43eaeef10469ee9c.tar.gz | |
Merge branch 'master' into elflink-merge
Resolved Conflicts:
core/diskfs.inc
core/mem/free.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/include/fs.h')
| -rw-r--r-- | core/include/fs.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/include/fs.h b/core/include/fs.h index 129ac1e6..fb416eef 100644 --- a/core/include/fs.h +++ b/core/include/fs.h @@ -116,8 +116,6 @@ struct file { struct inode *inode; /* The file-specific information */ }; -enum dev_type {CHS, EDD}; - /* * Struct device contains: * the pointer points to the disk structure, |