diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-27 13:12:40 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-27 13:12:40 +1000 |
| commit | f480fe3916de2e2cbb6e384cb685f0f1d8272188 (patch) | |
| tree | 141c60a2a263f1c01907e692d4aef1e6b699d8c7 /arch/arm/configs/kirkwood_defconfig | |
| parent | 4f0dbc2781b9dc457159b676289f874ab2dc3560 (diff) | |
| parent | f415c413f458837bd0c27086b79aca889f9435e4 (diff) | |
| download | linux-f480fe3916de2e2cbb6e384cb685f0f1d8272188.tar.gz linux-f480fe3916de2e2cbb6e384cb685f0f1d8272188.tar.bz2 linux-f480fe3916de2e2cbb6e384cb685f0f1d8272188.zip | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/configs/kirkwood_defconfig')
| -rw-r--r-- | arch/arm/configs/kirkwood_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index 0a1abb978d7e..af74cc2de8b6 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig @@ -629,7 +629,7 @@ CONFIG_SCSI_LOWLEVEL=y CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set CONFIG_SATA_PMP=y -# CONFIG_SATA_AHCI is not set +CONFIG_SATA_AHCI=y # CONFIG_SATA_SIL24 is not set CONFIG_ATA_SFF=y # CONFIG_SATA_SVW is not set |