diff options
| author | Jesse Barnes | 2008-06-12 21:06:58 +0200 |
|---|---|---|
| committer | Jesse Barnes | 2008-06-12 21:06:58 +0200 |
| commit | 53eb2fbeb9e68e1a9a23945de8450999c46270ce (patch) | |
| tree | 3c50f8690f63b53b3cffbcc226cbbe3c8c6de753 /include/linux | |
| parent | PCI: ACPI PCI slot detection driver (diff) | |
| parent | ACPI PM: Remove obsolete Toshiba workaround (diff) | |
| download | kernel-qcow2-linux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.tar.gz kernel-qcow2-linux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.tar.xz kernel-qcow2-linux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.zip | |
Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next
Diffstat (limited to 'include/linux')
| -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 f8f195c20da2..9918772bf274 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -153,7 +153,7 @@ enum { ide_unknown, ide_generic, ide_pci, ide_qd65xx, ide_umc8672, ide_ht6560b, ide_rz1000, ide_trm290, ide_cmd646, ide_cy82c693, ide_4drives, - ide_pmac, ide_etrax100, ide_acorn, + ide_pmac, ide_acorn, ide_au1xxx, ide_palm3710 }; |