diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-30 16:00:04 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-30 16:00:04 -0500 |
| commit | 07b188ab773e183871e57b33ae37bf635c9f12ba (patch) | |
| tree | 311df8a0dd12fb7bd3e9b5b1a5ca500f0428d679 /include/linux/ide.h | |
| parent | 47c564e10f219f867bdb49225972749a43485a47 (diff) | |
| parent | 9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index a6dbb51ecd7b..3461abc1e854 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -218,7 +218,7 @@ typedef enum { ide_unknown, ide_generic, ide_pci, | |||
| 218 | ide_rz1000, ide_trm290, | 218 | ide_rz1000, ide_trm290, |
| 219 | ide_cmd646, ide_cy82c693, ide_4drives, | 219 | ide_cmd646, ide_cy82c693, ide_4drives, |
| 220 | ide_pmac, ide_etrax100, ide_acorn, | 220 | ide_pmac, ide_etrax100, ide_acorn, |
| 221 | ide_forced | 221 | ide_au1xxx, ide_forced |
| 222 | } hwif_chipset_t; | 222 | } hwif_chipset_t; |
| 223 | 223 | ||
| 224 | /* | 224 | /* |