From 13fc33d4ffeda7b6f4ed8b14070a01b32259279b Mon Sep 17 00:00:00 2001 From: Roy ZANG Date: Wed, 10 Apr 2013 17:40:49 -0500 Subject: [PATCH] --- yaml --- r: 370869 b: refs/heads/master c: c897848d8d58ae6b5485efc19a20fa64b28ddf94 h: refs/heads/master i: 370867: 95595853925efce7998c990b2ea3f73041afb303 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/configs/mpc85xx_defconfig | 1 + trunk/arch/powerpc/configs/mpc85xx_smp_defconfig | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a02b33275c4c..49acfc19cbd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2adb1aee19687e9f0f398abaceb31ee5a2b68b8 +refs/heads/master: c897848d8d58ae6b5485efc19a20fa64b28ddf94 diff --git a/trunk/arch/powerpc/configs/mpc85xx_defconfig b/trunk/arch/powerpc/configs/mpc85xx_defconfig index 37812b4b777b..5a58882e351e 100644 --- a/trunk/arch/powerpc/configs/mpc85xx_defconfig +++ b/trunk/arch/powerpc/configs/mpc85xx_defconfig @@ -121,6 +121,7 @@ CONFIG_SCSI_LOGGING=y CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_FSL=y +CONFIG_SATA_SIL24=y CONFIG_PATA_ALI=y CONFIG_PATA_VIA=y CONFIG_NETDEVICES=y diff --git a/trunk/arch/powerpc/configs/mpc85xx_smp_defconfig b/trunk/arch/powerpc/configs/mpc85xx_smp_defconfig index 7fc3e6ffe1cc..165e6b32baef 100644 --- a/trunk/arch/powerpc/configs/mpc85xx_smp_defconfig +++ b/trunk/arch/powerpc/configs/mpc85xx_smp_defconfig @@ -124,6 +124,7 @@ CONFIG_SCSI_LOGGING=y CONFIG_ATA=y CONFIG_SATA_AHCI=y CONFIG_SATA_FSL=y +CONFIG_SATA_SIL24=y CONFIG_PATA_ALI=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y