diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-23 02:17:28 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-23 02:17:28 -0500 |
| commit | 66a101dda6b26ee566aa9cadcbea904a41d2b268 (patch) | |
| tree | e03b5d40b7b88bb0a2f432bceba4680086d6d3a1 /arch/ia64/configs/generic_defconfig | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| parent | 28b7e343ee63454d563a71d2d5f769fc297fd5ad (diff) | |
Merge branch 'topic/hwdep-cleanup' into topic/hdsp
Diffstat (limited to 'arch/ia64/configs/generic_defconfig')
| -rw-r--r-- | arch/ia64/configs/generic_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 27eb67604c53..a109db30ce55 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig | |||
| @@ -578,7 +578,7 @@ CONFIG_ATA_PIIX=y | |||
| 578 | # CONFIG_SATA_SIS is not set | 578 | # CONFIG_SATA_SIS is not set |
| 579 | # CONFIG_SATA_ULI is not set | 579 | # CONFIG_SATA_ULI is not set |
| 580 | # CONFIG_SATA_VIA is not set | 580 | # CONFIG_SATA_VIA is not set |
| 581 | # CONFIG_SATA_VITESSE is not set | 581 | CONFIG_SATA_VITESSE=y |
| 582 | # CONFIG_SATA_INIC162X is not set | 582 | # CONFIG_SATA_INIC162X is not set |
| 583 | # CONFIG_PATA_ACPI is not set | 583 | # CONFIG_PATA_ACPI is not set |
| 584 | # CONFIG_PATA_ALI is not set | 584 | # CONFIG_PATA_ALI is not set |