aboutsummaryrefslogtreecommitdiffstats
path: root/debian/arch/m68k
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@debian.org>2005-09-12 03:48:11 +0000
committerAndres Salomon <dilinger@debian.org>2005-09-12 03:48:11 +0000
commit181dfce6577ce35d1e7623efd6a7189a7121b9e3 (patch)
tree654609825ef550046d9fbd0e2ea1dfc8388fccd9 /debian/arch/m68k
parente4a5fd96fe79e65217f47d96a028d1ea62e0bef6 (diff)
downloadkernel_replicant_linux-181dfce6577ce35d1e7623efd6a7189a7121b9e3.tar.gz
kernel_replicant_linux-181dfce6577ce35d1e7623efd6a7189a7121b9e3.tar.bz2
kernel_replicant_linux-181dfce6577ce35d1e7623efd6a7189a7121b9e3.zip
ugh. conflicts galore.. suck.
svn path=/dists/trunk/linux-2.6/; revision=4171
Diffstat (limited to 'debian/arch/m68k')
-rw-r--r--debian/arch/m68k/config1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config
index aa949f2aa709..0a0607194de7 100644
--- a/debian/arch/m68k/config
+++ b/debian/arch/m68k/config
@@ -77,6 +77,7 @@ CONFIG_SCSI_CONSTANTS=y
# CONFIG_SCSI_SPI_ATTRS is not set
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SATA is not set
# CONFIG_SCSI_DEBUG is not set
CONFIG_MD=y
CONFIG_BLK_DEV_MD=m