summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/defconfig
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
commit95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch)
tree27a92a942821cde1edda9a1b088718d436b3efe4 /arch/sparc64/defconfig
parent45b27b0a0652331d104c953a5b192d843fff88f8 (diff)
Merge with Linux 2.3.40.
Diffstat (limited to 'arch/sparc64/defconfig')
-rw-r--r--arch/sparc64/defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 848984fef..59db5d4bc 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -139,7 +139,7 @@ CONFIG_BLK_DEV_IDEDMA=y
CONFIG_IDEDMA_AUTO=y
CONFIG_IDEDMA_NEW_DRIVE_LISTINGS=y
CONFIG_BLK_DEV_NS87415=y
-CONFIG_BLK_DEV_CMD646=y
+CONFIG_BLK_DEV_CMD64X=y
#
# Networking options