Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[linux-2.6] / arch / m68k / configs / sun3_defconfig

diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index b96b4584735acf50cec0db3834378e99ad4dcbd3..af903b5c5708c8150ddba154ae96190eac314175 100644 (file)
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -173,7 +173,6 @@ CONFIG_SCSI_CONSTANTS=y
 #
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
-CONFIG_SUN3_SCSI=y
 
 #
 # Multi-device support (RAID and LVM)