From 3d65ed67425b6c6f9076993cb604b5bdf9fa59bb Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 6 Mar 2006 16:39:25 +0100 Subject: [PATCH] --- yaml --- r: 21063 b: refs/heads/master c: e2c552cc89287e31b0b2472866a69a44b150acd2 h: refs/heads/master i: 21061: f26a781a829b432cfc185a89ec95474e57790699 21059: f8801498e6527e172a03d4d6972baaed7aa75a8d 21055: e73c900282d9196c6f9bc9ff0da7d4f5538e18ce v: v3 --- [refs] | 2 +- trunk/arch/powerpc/configs/ppc64_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ee0b114d5e45..2aab332c3e4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eacb1962d4594b9d382b40acd73a9c9492718f74 +refs/heads/master: e2c552cc89287e31b0b2472866a69a44b150acd2 diff --git a/trunk/arch/powerpc/configs/ppc64_defconfig b/trunk/arch/powerpc/configs/ppc64_defconfig index 0362a70aa97c..395e49847788 100644 --- a/trunk/arch/powerpc/configs/ppc64_defconfig +++ b/trunk/arch/powerpc/configs/ppc64_defconfig @@ -407,7 +407,7 @@ CONFIG_IDEPCI_SHARE_IRQ=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=y # CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_SL82C105 is not set +CONFIG_BLK_DEV_SL82C105=y CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y