aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian T. Steigies <cts@debian.org>2007-05-14 13:28:06 +0000
committerChristian T. Steigies <cts@debian.org>2007-05-14 13:28:06 +0000
commit498f2048b7766c9334d692092458b6142cb9236c (patch)
tree510015b743fdd9f2ded7b9029c0d1ab83284a484
parentc900d2466a0eac0f0321170cbb63ba605e780a0f (diff)
downloadkernel_replicant_linux-498f2048b7766c9334d692092458b6142cb9236c.tar.gz
kernel_replicant_linux-498f2048b7766c9334d692092458b6142cb9236c.tar.bz2
kernel_replicant_linux-498f2048b7766c9334d692092458b6142cb9236c.zip
fix config.atari
svn path=/dists/trunk/linux-2.6/; revision=8580
-rw-r--r--debian/arch/m68k/config.atari7
-rw-r--r--debian/arch/m68k/config.mac2
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/arch/m68k/config.atari b/debian/arch/m68k/config.atari
index 73375ab3d40c..598f135c0e29 100644
--- a/debian/arch/m68k/config.atari
+++ b/debian/arch/m68k/config.atari
@@ -105,7 +105,6 @@ CONFIG_NCPFS_OS2_NS=y
CONFIG_ATARI_PARTITION=y
CONFIG_CRC32=y
# enable new ethernet drivers
-CONFIG_ATARI_ROM_ISA=y
CONFIG_ARANYM=y
CONFIG_NATFEAT=y
# Atari SCSI driver is buggy
@@ -115,3 +114,9 @@ CONFIG_NET_ETHERNET=y
CONFIG_ATARILANCE=y
CONFIG_ATARI_NFETH=y
CONFIG_ATARI_ETHERNEC=m
+# 2.6.21
+# disable atari_rom_isa for now
+# CONFIG_ATARI_ROM_ISA is not set
+# uses undefined isa_*
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC
diff --git a/debian/arch/m68k/config.mac b/debian/arch/m68k/config.mac
index 5e9721b1c603..edfa8d3299b2 100644
--- a/debian/arch/m68k/config.mac
+++ b/debian/arch/m68k/config.mac
@@ -129,4 +129,4 @@ CONFIG_CRC32=y
# 2.6.21
# uses undefined isa_*
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC is not set \ No newline at end of file
+# CONFIG_PARPORT_PC is not set